Merge lp:~cjohnston/loco-team-portal/bugfix-lp-610040 into lp:loco-team-portal

[Chris Johnston]

Adds DEBUG_USER to allow for local testing.

[lp:~cjohnston/loco-team-portal/bugfix-lp-610040]

207. By Chris Johnston on 2010-07-30

Fixes intentions and adds DEBUG to is_admin_or_owner

208. By Chris Johnston on 2010-07-30

Removes user.is_authenticated() from is_admin_or_owner

[Daniel Holbach (dholbach)]

 - is_admin_or_owner needs the user.is_authenticated() check too
 - "request.user.is_authenticated()" check in global_event_detail in events/views.py can be removed
 - I don't think we need DEBUG_USER in settings.py
 - can we make it DEBUG_USERS instead? so it'd be possible to specify more than one person?

Apart from that: good work.

review: Needs Fixing

[Michael Hall (mhall119)]

is_admin_or_owner doesn't pass a user object, just a username, so we can't call is_authenticated().

I told him to put it in settings.py because I didn't want Python failing if the user wasn't using a local_settings.py

I'm not sure there's much of a case for having multiple debugging users at the same time, can you elaborate on how that would be useful?

[lp:~cjohnston/loco-team-portal/bugfix-lp-610040]

209. By Chris Johnston on 2010-07-30

Adds is_debug_user

[Michael Hall (mhall119)]

Works well for me.

review: Approve

=== modified file 'loco_directory/common/launchpad.py'
--- loco_directory/common/launchpad.py	2010-06-18 18:46:02 +0000
+++ loco_directory/common/launchpad.py	2010-07-30 16:16:42 +0000
@@ -10,6 +10,14 @@
 import os
 import sys
 
+def is_debug_user(username):
+    try:
+        if settings.DEBUG and username in settings.DEBUG_USERS:
+            return True
+    except AttributeError:
+        return False
+    return False
+
 def lp_login(lp_instance=EDGE_SERVICE_ROOT):
     cachedir = os.path.join(settings.PROJECT_PATH, 'lp_data/cache')
     client_ident = getattr(settings, 'LP_PROJECT_NAME', "LoCo Directory")
@@ -22,13 +30,17 @@
 
 def is_user_on_loco_council(user):
     if not user.is_authenticated():
-	return False
+        return False
+    if is_debug_user(user.username):
+        return True
     lc_in_groups = user.groups.filter(name__exact='ubuntu-lococouncil')
     return (lc_in_groups.count() == 1)
 
 def is_team_member(user, team):
     if not user.is_authenticated():
-	return False
+        return False
+    if is_debug_user(user.username):
+        return True
     user_in_groups = user.groups.filter(name__exact=team.lp_name)
     return (user_in_groups.count() >= 1)
 
@@ -38,7 +50,8 @@
         return True
     if team.admins.filter(lpid=username):
         return True
-    
+    if is_debug_user(username):
+        return True
     # more complicated check :-/
     lp = lp_login()
     try:

=== modified file 'loco_directory/events/views.py'
--- loco_directory/events/views.py	2010-07-29 07:54:21 +0000
+++ loco_directory/events/views.py	2010-07-30 16:16:42 +0000
@@ -355,7 +355,7 @@
     global_event_object = get_object_or_404(GlobalEvent, pk=global_event_id)
     add_team_event = (request.user and request.user.is_authenticated() and \
                       request.user.groups.exclude(name__exact='ubuntu-lococouncil'))
-    is_on_lc = request.user.is_authenticated() and launchpad.is_user_on_loco_council(request.user)
+    is_on_lc = launchpad.is_user_on_loco_council(request.user)
     context = {
         'global_event_object': global_event_object,
         'add_team_event': add_team_event,

=== modified file 'loco_directory/local_settings.py.sample'
--- loco_directory/local_settings.py.sample	2010-02-16 17:14:13 +0000
+++ loco_directory/local_settings.py.sample	2010-07-30 16:16:42 +0000
@@ -5,3 +5,4 @@
 
 SECRET_KEY = '' 
 
+DEBUG_USERS = ('')