equal
deleted
inserted
replaced
18 """ |
18 """ |
19 |
19 |
20 __authors__ = [ |
20 __authors__ = [ |
21 '"Daniel Diniz" <ajaksu@gmail.com>', |
21 '"Daniel Diniz" <ajaksu@gmail.com>', |
22 '"James Levy" <jamesalexanderlevy@gmail.com>', |
22 '"James Levy" <jamesalexanderlevy@gmail.com>', |
|
23 '"Lennard de Rijk" <ljvderijk@gmail.com>', |
23 ] |
24 ] |
24 |
25 |
25 import csv |
26 import csv |
26 import datetime |
27 import datetime |
27 import re |
28 import re |
181 widget=widgets.ReadOnlyInput(), required=False), |
182 widget=widgets.ReadOnlyInput(), required=False), |
182 'clean': cleaning.validate_document_acl(self), |
183 'clean': cleaning.validate_document_acl(self), |
183 } |
184 } |
184 |
185 |
185 params = dicts.merge(params, new_params) |
186 params = dicts.merge(params, new_params) |
|
187 |
186 super(View, self).__init__(params=params) |
188 super(View, self).__init__(params=params) |
187 |
189 |
188 def list(self, request, access_type, page_name=None, params=None, |
190 def list(self, request, access_type, page_name=None, params=None, |
189 filter=None, order=None, **kwargs): |
191 filter=None, order=None, **kwargs): |
190 """See base.View.list. |
192 """See base.View.list. |
286 return False |
288 return False |
287 |
289 |
288 survey_form = surveys.SurveyForm(survey_content=survey_content, |
290 survey_form = surveys.SurveyForm(survey_content=survey_content, |
289 this_user=user, |
291 this_user=user, |
290 project=project, |
292 project=project, |
|
293 survey_logic=self._params['logic'], |
291 survey_record=survey_record, |
294 survey_record=survey_record, |
292 read_only=read_only, |
295 read_only=read_only, |
293 editing=False) |
296 editing=False) |
294 survey_form.getFields() |
297 survey_form.getFields() |
295 if 'evaluation' in survey.taking_access: |
298 if 'evaluation' in survey.taking_access: |
624 project = None |
627 project = None |
625 survey_record = None |
628 survey_record = None |
626 |
629 |
627 |
630 |
628 survey_form = surveys.SurveyForm(survey_content=survey_content, |
631 survey_form = surveys.SurveyForm(survey_content=survey_content, |
629 this_user=user, project=project, survey_record=survey_record, |
632 this_user=user, project=project, |
|
633 survey_logic=params['logic'], |
|
634 survey_record=survey_record, |
630 editing=True, read_only=False) |
635 editing=True, read_only=False) |
631 survey_form.getFields() |
636 survey_form.getFields() |
632 |
637 |
633 |
638 |
634 # activate grades flag -- TODO: Can't configure notice on edit page |
639 # activate grades flag -- TODO: Can't configure notice on edit page |