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

[Adnane Belmadiaf]

Added the ability to merge teams for LC

[Chris Johnston (cjohnston)]

Voting does not meet specified criteria. Required: Approve >= 1. Got: 1 Pending.

[Michael Hall (mhall119)]

Looks good to me

review: Approve

=== modified file 'loco_directory/teams/views.py'
--- loco_directory/teams/views.py	2013-10-30 00:43:18 +0000
+++ loco_directory/teams/views.py	2013-11-24 14:30:15 +0000
@@ -236,7 +236,9 @@
 
     #check if user has needed rights
     is_admin = launchpad.is_admin_or_owner(request.user.username, team_object)
-    if not is_admin:
+    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)
     team_list = Team.objects.all().order_by('name')
@@ -258,7 +260,9 @@
     #check if user has needed rights
     is_admin = launchpad.is_admin_or_owner(request.user.username, old_team) and \
                launchpad.is_admin_or_owner(request.user.username, new_team)
-    if not is_admin:
+    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)