app/soc/views/models/survey.py
changeset 2504 74b115310fb0
parent 2503 c14a754b0644
child 2516 afae8791ad97
equal deleted inserted replaced
2503:c14a754b0644 2504:74b115310fb0
   551                                      survey_logic=self._params['logic'])
   551                                      survey_logic=self._params['logic'])
   552 
   552 
   553     # fetch field contents and pass request data, if any
   553     # fetch field contents and pass request data, if any
   554     survey_form.getFields(post_dict=form_data)
   554     survey_form.getFields(post_dict=form_data)
   555 
   555 
   556     # validate request data
       
   557     if form_data and not survey_form.is_valid():
       
   558       survey_form.full_clean()
       
   559       context['survey_form'] = survey_form
       
   560       return self._constructResponse(request, entity=None, context=context,
       
   561           form=survey_form, params=params, template=template)
       
   562 
       
   563     # fill context with the survey and additional information
   556     # fill context with the survey and additional information
   564     context['survey_form'] = survey_form
   557     context['survey_form'] = survey_form
   565     self.setHelpAndStatus(context, entity, record)
   558     self.setHelpAndStatus(context, entity, record)
       
   559 
       
   560     # validate request data
       
   561     if form_data and not survey_form.is_valid():
       
   562       return self._constructResponse(request, entity=entity, context=context,
       
   563           form=survey_form, params=params, template=template)
   566 
   564 
   567     # call the hook method
   565     # call the hook method
   568     self._takeGet(request, template, context, params, entity, record, **kwargs)
   566     self._takeGet(request, template, context, params, entity, record, **kwargs)
   569 
   567 
   570     return responses.respond(request, template, context)
   568     return responses.respond(request, template, context)