Some forgotten changes with the access_type commit
authorSverre Rabbelier <srabbelier@gmail.com>
Sun, 07 Dec 2008 20:02:17 +0000
changeset 712 b9e4cc00f30a
parent 711 4bfb1a2d5bfe
child 713 bcd480745f44
Some forgotten changes with the access_type commit Patch by: Sverre Rabbelier
app/soc/views/models/document.py
app/soc/views/models/program.py
--- a/app/soc/views/models/document.py	Sun Dec 07 19:18:24 2008 +0000
+++ b/app/soc/views/models/document.py	Sun Dec 07 20:02:17 2008 +0000
@@ -98,7 +98,7 @@
 
     rights = {}
     rights['any_access'] = [access.allow]
-    rights['public'] = [access.checkIsDocumentPublic]
+    rights['show'] = [access.checkIsDocumentPublic]
 
     new_params = {}
     new_params['logic'] = soc.logic.models.document.logic
--- a/app/soc/views/models/program.py	Sun Dec 07 19:18:24 2008 +0000
+++ b/app/soc/views/models/program.py	Sun Dec 07 20:02:17 2008 +0000
@@ -55,7 +55,7 @@
 
     rights = {}
     rights['any_access'] = [access.allow]
-    rights['public'] = [access.allow]
+    rights['show'] = [access.allow]
 
     new_params = {}
     new_params['logic'] = soc.logic.models.program.logic
@@ -99,13 +99,14 @@
 
     entities = logic.getForLimitAndOffset(1000)
 
+    doc_params = document_view.view.getParams()
     menus = []
 
     for entity in entities:
       menu = {}
       menu['heading'] = entity.short_name
       items = document_view.view.getMenusForScope(entity, params)
-      menu['items'] = sidebar.getSidebarMenu(request, items, params=params)
+      menu['items'] = sidebar.getSidebarMenu(request, items, params=doc_params)
       menus.append(menu)
 
     return menus