--- a/app/soc/views/models/program.py Sun Jul 05 00:57:03 2009 +0200
+++ b/app/soc/views/models/program.py Sun Jul 05 11:32:26 2009 +0200
@@ -52,7 +52,6 @@
from soc.views.models import presence
from soc.views.models import document as document_view
from soc.views.models import sponsor as sponsor_view
-from soc.views.models import survey as survey_view
from soc.views.sitemap import sidebar
import soc.cache.logic
@@ -620,6 +619,10 @@
params: a dict with params for this View.
"""
+ from soc.views.models import survey as survey_view
+ from soc.views.models import project_survey as project_survey_view
+ from soc.views.models import grading_project_survey as grading_survey_view
+
logic = params['logic']
rights = params['rights']
@@ -637,8 +640,12 @@
if entity.status == 'visible':
# show the documents for this program, even for not logged in users
items += document_view.view.getMenusForScope(entity, params)
+ items += survey_view.view.getMenusForScope(entity, params, id, user)
+ items += project_survey_view.view.getMenusForScope(
+ entity, params, id, user)
+ items += grading_survey_view.view.getMenusForScope(
+ entity, params, id, user)
items += self._getTimeDependentEntries(entity, params, id, user)
-
try:
# check if the current user is a host for this program
rights.doCachedCheck('checkIsHostForProgram',
@@ -648,6 +655,11 @@
if entity.status == 'invisible':
# still add the document links so hosts can see how it looks like
items += document_view.view.getMenusForScope(entity, params)
+ items += survey_view.view.getMenusForScope(entity, params, id, user)
+ items += project_survey_view.view.getMenusForScope(
+ entity, params, id, user)
+ items += grading_survey_view.view.getMenusForScope(
+ entity, params, id, user)
items += self._getTimeDependentEntries(entity, params, id, user)
items += [(redirects.getReviewOverviewRedirect(