py_tasks_melange: comparison app/soc/views/models/survey.py

equal deleted inserted replaced

-:e319fd52cbc4
+:7a1138f8a0e2
 from soc.models.user import User
 from soc.views import out_of_band
 from soc.views.helper import access
 from soc.views.helper import decorators
 from soc.views.helper import forms as forms_helper
+from soc.views.helper import lists
 from soc.views.helper import redirects
 from soc.views.helper import responses
 from soc.views.helper import surveys
 from soc.views.helper import widgets
 from soc.views.models import base
 rights['create'] = ['checkIsUser']
 rights['edit'] = [('checkIsSurveyWritable', survey_logic)]
 rights['delete'] = ['checkIsDeveloper'] # TODO: fix deletion of Surveys
 rights['list'] = ['checkDocumentList']
 rights['pick'] = ['checkDocumentPick']
+rights['results'] = [('checkIsSurveyWritable', survey_logic)]
 rights['take'] = [('checkIsSurveyTakeable', survey_logic)]
 new_params = {}
 new_params['logic'] = survey_logic
 new_params['rights'] = rights
 'soc.views.models.%(module_name)s.take',
 'Take %(name)s'),
 (r'^%(url_name)s/(?P<access_type>json)/%(scope)s$',
 'soc.views.models.%(module_name)s.json',
 'Export %(name)s as JSON'),
-(r'^%(url_name)s/(?P<access_type>results)/%(scope)s$',
+(r'^%(url_name)s/(?P<access_type>results)/%(key_fields)s$',
 'soc.views.models.%(module_name)s.results',
 'View survey results for %(name)s'),
 (r'^%(url_name)s/(?P<access_type>show)/user/(?P<link_id>)\w+$',
 'soc.views.models.%(module_name)s.results',
 'View survey results for user'),
 context['survey_form'] = survey_form
 # return True to signal that the page may be displayed
 return True
-def _editContext(self, request, context):
-"""Performs any required processing on the context for edit pages.
-Args:
-request: the django request object
-context: the context dictionary that will be used
-Adds list of SurveyRecord results as supplement to view.
-See surveys.SurveyResults for details.
-"""
-if not getattr(self, '_entity', None):
-return
-results = surveys.SurveyResults()
-context['survey_records'] = results.render(self._entity, self._params,
-filter={})
-super(View, self)._editContext(request, context)
 def _editPost(self, request, entity, fields):
 """See base.View._editPost().
 Processes POST request items to add new dynamic field names,
 question types, and default prompt values to SurveyContent model.
 @decorators.merge_params
 @decorators.check_access
 def viewResults(self, request, access_type, page_name=None,
 params=None, **kwargs):
-"""View for SurveyRecord and SurveyRecordGroup.
+"""View for SurveyRecords.
-"""
+For params see base.View.public().
-results_logic = params['logic'].getRecordLogic()
+"""
+survey_logic = params['logic']
+try:
+entity = survey_logic.getFromKeyFieldsOr404(kwargs)
+except out_of_band.Error, error:
+return responses.errorResponse(
+error, request, template=params['error_public'])
+# get the context for this webpage
+context = responses.getUniversalContext(request)
+responses.useJavaScript(context, params['js_uses_all'])
+context['page_name'] = "%s titled '%s'" % (page_name, entity.title)
+context['entity'] = entity
+results_logic = survey_logic.getRecordLogic()
 user = user_logic.getForCurrentAccount()
-# TODO(ajaksu) use the named parameter link_id from the re
+context['properties'] = entity.survey_content.orderedProperties()
-if request.path == '/survey/show/user/' + user.link_id:
-records = tuple(user.surveys_taken.run())
+filter = self._params.get('filter') or {}
-context = responses.getUniversalContext(request)
-context['content'] = records[0].survey.survey_content
+filter['survey'] = entity
-responses.useJavaScript(context, params['js_uses_all'])
-context['page_name'] = u'Your survey records.'
+list_params = params.copy()
-else:
+list_params['list_description'] = \
-entity, context = self.getContextEntity(request, page_name,
+'List of  %(name_plural)s.' % list_params
-params, kwargs)
+list_params['logic'] = results_logic
-if context is None:
-# user cannot see this page, return error response
+valid_list = lists.getListContent(request, list_params, filter, idx=0)
-return entity
-context['content'] = entity.survey_content
+valid_list['row'] = 'soc/survey/list/results_row.html'
-can_write = False
+valid_list['heading'] = 'soc/survey/list/results_heading.html'
-rights = self._params['rights']
+valid_list['description'] = 'Survey Results:'
-try:
-rights.checkIsSurveyWritable({'key_name': entity.key().name(),
+contents = []
-'prefix': entity.prefix,
+# fill contents with all the needed lists
-'scope_path': entity.scope_path,
+contents.append(valid_list)
-'link_id': entity.link_id,},
-'key_name')
+return self._list(request, list_params, contents, page_name, context)
-can_write = True
-except out_of_band.AccessViolation:
-pass
-filter = self._params.get('filter') or {}
-# if user can edit the survey, show everyone's results
-if can_write:
-filter['survey'] = entity
-else:
-filter.update({'user': user, 'survey': entity})
-limit = self._params.get('limit') or 1000
-offset = self._params.get('offset') or 0
-order = self._params.get('order') or []
-idx = self._params.get('idx') or 0
-records = results_logic.getForFields(filter=filter, limit=limit,
-offset=offset, order=order)
-updates = dicts.rename(params, params['list_params'])
-context.update(updates)
-context['results'] = records, records
-template = 'soc/survey/results_page.html'
-return responses.respond(request, template, context=context)
 @decorators.merge_params
 @decorators.check_access
 def exportSerialized(self, request, access_type, page_name=None,
 params=None, **kwargs):

changeset 2576	7a1138f8a0e2
parent 2560	a944c0169ad8
child 2582	df5939fecaff