Changeset 246 for trunk

Timestamp:

Nov 13, 2007, 8:18:32 PM (17 years ago)

Author:

ecprice

Message:

Revert to old list method until we start updating the cache.
Fix a bug in getafsgroups.

Location:

trunk/web

Files:

• getafsgroups.py (modified) (1 diff)
• main.py (modified) (1 diff)

trunk/web/getafsgroups.py

@@ -77 +77 @@
 
     for entry in values:
-        if entry[0] == user or (entry[0][0:6] == "system" and 
-                                checkAfsGroup(user, entry[0], cell)):
+        if entry == user or (entry[0:6] == "system" and 
+                                checkAfsGroup(user, entry, cell)):
             return False
     return "You don't have admin bits on /mit/" + locker

trunk/web/main.py

@@ -185 +185 @@
 
 def getListDict(user):
-    machines = [m for m in Machine.select() 
-                if validation.haveAccess(user, m)]    
+    machines = [m for m in Machine.select()
+                if validation.haveAccess(user, m)]
+    #if user == 'moo':
+    #    machines = Machine.select()
+    #else:
+    #    machines = Machine.query().join('users').filter_by(user=user).all()
     checkpoint.checkpoint('Got my machines')
     on = {}