Merge lp:~daker/loco-team-portal/fix.1251958-2 into lp:loco-team-portal

[Adnane Belmadiaf]

Make sure LC has the right to merge teams

[Michael Hall (mhall119)]

Could have just switched the 'or' to an 'and', but this looks fine too

review: Approve

=== modified file 'loco_directory/teams/views.py'
--- loco_directory/teams/views.py	2013-11-24 14:27:03 +0000
+++ loco_directory/teams/views.py	2014-01-12 19:24:22 +0000
@@ -238,9 +238,11 @@
     is_admin = launchpad.is_admin_or_owner(request.user.username, team_object)
     is_on_lc = launchpad.is_user_on_loco_council(request.user)
 
-    if not is_admin or not is_on_lc:
-        request.user.message_set.create(message=ugettext('You are not allowed to merge this team with another one.'))
-        return redirect(team_object)
+    if not is_admin:
+        if not is_on_lc:
+            request.user.message_set.create(message=ugettext('You are not allowed to merge this team with another one.'))
+            return redirect(team_object)
+
     team_list = Team.objects.all().order_by('name')
     other_teams = team_list.exclude(id=team_object.id)
     return render_to_response('teams/select_other_team.html',
@@ -262,9 +264,10 @@
                launchpad.is_admin_or_owner(request.user.username, new_team)
     is_on_lc = launchpad.is_user_on_loco_council(request.user)
 
-    if not is_admin or not is_on_lc:
-        request.user.message_set.create(message=ugettext('You are not allowed to merge this team with another one.'))
-        return redirect(old_team)
+    if not is_admin:
+        if not is_on_lc:
+            request.user.message_set.create(message=ugettext('You are not allowed to merge this team with another one.'))
+            return redirect(old_team)
 
     msgs = merge_teams(old_team, new_team)
     for msg in msgs: