app/soc/logic/models/survey.py
changeset 2467 f46cff8d676b
parent 2466 70854ec7909d
child 2480 0079e1038740
equal deleted inserted replaced
2466:70854ec7909d 2467:f46cff8d676b
   191 
   191 
   192     fields = {'survey_content': survey_content}
   192     fields = {'survey_content': survey_content}
   193 
   193 
   194     return self.getForFields(fields, unique=True)
   194     return self.getForFields(fields, unique=True)
   195 
   195 
   196 <<<<<<< local
       
   197 =======
       
   198   def getRecordLogic(self):
   196   def getRecordLogic(self):
   199     """Returns SurveyRecordLogic that belongs to this SurveyLogic.
   197     """Returns SurveyRecordLogic that belongs to this SurveyLogic.
   200     """
   198     """
   201 
   199 
   202     return self.record_logic
   200     return self.record_logic
   203 
   201 
   204 >>>>>>> other
       
   205   def getUserRole(self, user, survey, project):
   202   def getUserRole(self, user, survey, project):
   206     """Gets the role of a user for a project, used for SurveyRecordGroup.
   203     """Gets the role of a user for a project, used for SurveyRecordGroup.
   207 
   204 
   208     params:
   205     params:
   209       user: user taking survey
   206       user: user taking survey