--- a/app/soc/modules/ghop/views/models/task.py	Fri Sep 25 09:21:47 2009 +0200
+++ b/app/soc/modules/ghop/views/models/task.py	Sun Sep 27 01:23:58 2009 +0530
@@ -519,9 +519,12 @@
 
     filter = {
         'user': user_account,
-        'scope': fields['scope'],
         'status': 'active'
         }
+    if not entity:
+      filter['scope'] = fields['scope']
+    else:
+      filter['scope'] = entity.program
 
     role_entity = ghop_org_admin_logic.logic.getForFields(
         filter, unique=True)