diff --git a/addons/survey/security/ir.model.access.csv b/addons/survey/security/ir.model.access.csv index e4b246e70e2..942b6db1960 100644 --- a/addons/survey/security/ir.model.access.csv +++ b/addons/survey/security/ir.model.access.csv @@ -11,9 +11,11 @@ access_survey_question_user,survey.question user,model_survey_question,base.grou access_survey_label_user,survey.label user,model_survey_label,base.group_survey_user,1,0,0,0 access_survey_user_input_user,survey.user_input user,model_survey_user_input,base.group_survey_user,1,1,1,0 access_survey_user_input_line_user,survey.user_input_line user,model_survey_user_input_line,base.group_survey_user,1,1,1,0 +access_survey_stage_user,survey.stage user,model_survey_stage,base.group_survey_user,1,0,0,0 access_survey_manager,survey.survey manager,model_survey_survey,base.group_survey_manager,1,1,1,1 access_survey_page_manager,survey.page manager,model_survey_page,base.group_survey_manager,1,1,1,1 access_survey_question_manager,survey.question manager,model_survey_question,base.group_survey_manager,1,1,1,1 access_survey_label_manager,survey.label manager,model_survey_label,base.group_survey_manager,1,1,1,1 access_survey_user_input_manager,survey.user_input manager,model_survey_user_input,base.group_survey_manager,1,1,1,1 access_survey_user_input_line_manager,survey.user_input_line manager,model_survey_user_input_line,base.group_survey_manager,1,1,1,1 +access_survey_stage_manager,survey.stage manager,model_survey_stage,base.group_survey_manager,1,1,1,1 \ No newline at end of file diff --git a/addons/survey/static/src/js/survey_result.js b/addons/survey/static/src/js/survey_result.js index 72ec404d0a2..54a6d248f95 100644 --- a/addons/survey/static/src/js/survey_result.js +++ b/addons/survey/static/src/js/survey_result.js @@ -100,7 +100,7 @@ $(document).ready(function () { console.log(current_filters); $.ajax({ url: '/survey/results/graph/'+question_id, - type: 'POST', // TODO check that something is posted + type: 'POST', dataType: 'json', data:{'current_filters': current_filters}, success: function(response, status, xhr, wfe){ diff --git a/addons/survey/survey.py b/addons/survey/survey.py index 0b98eb1ede5..9d84719b17f 100644 --- a/addons/survey/survey.py +++ b/addons/survey/survey.py @@ -130,6 +130,7 @@ class survey_survey(osv.Model): 'state': fields.selection( [('draft', 'Draft'), ('open', 'Open'), ('close', 'Closed'), ('cancel', 'Cancelled')], 'Status', required=1, translate=1), + 'stage_id': fields.many2one('survey.stage', string="Stage"), 'visible_to_user': fields.boolean('Public in website', help="If unchecked, only invited users will be able to open the survey."), 'auth_required': fields.boolean('Login required', @@ -340,6 +341,27 @@ class survey_survey(osv.Model): } +class survey_stage(osv.Model): + """Stages for Kanban view of surveys""" + + _name = 'survey.stage' + _description = 'Survey Stage' + _order = 'sequence' + + _columns = { + 'name': fields.text(string="Name", required=True, translate=True), + 'sequence': fields.integer(string="Sequence"), + 'open': fields.boolean(string="Display these surveys?") + } + _defaults = { + 'sequence': 1, + 'open': True + } + _sql_constraints = [ + ('positive_sequence', 'CHECK(sequence >= 0)', 'Sequence number MUST be a natural') + ] + + class survey_page(osv.Model): '''A page for a survey. diff --git a/addons/survey/views/survey_views.xml b/addons/survey/views/survey_views.xml index ff2ec61980a..0c9f28ec705 100644 --- a/addons/survey/views/survey_views.xml +++ b/addons/survey/views/survey_views.xml @@ -213,7 +213,7 @@ survey.kanban survey.survey - +