From 4c0cd7b7ed53093671cf008c40930b4d9e4f5e97 Mon Sep 17 00:00:00 2001 From: Jigar Amin Date: Tue, 8 Mar 2011 18:29:11 +0530 Subject: [PATCH] [BUF/FIX] survey, base_calendar : added new access rights for the Survey/User for Invited user of the Survey lp bug: https://launchpad.net/bugs/730651 fixed bzr revid: jam@tinyerp.com-20110308125911-pzwecd8396dxjnib --- addons/base_calendar/__openerp__.py | 1 + .../security/ir.model.access.csv | 1 + .../security/ir.model.access.csv | 2 +- addons/survey/security/ir.model.access.csv | 18 ++++++------- addons/survey/security/survey_security.xml | 27 ++++++++----------- addons/survey/survey_demo.xml | 2 +- addons/survey/survey_view.xml | 6 ++--- .../survey/wizard/survey_send_invitation.py | 2 +- 8 files changed, 28 insertions(+), 31 deletions(-) diff --git a/addons/base_calendar/__openerp__.py b/addons/base_calendar/__openerp__.py index 6a52e30de27..2d94e61beb8 100644 --- a/addons/base_calendar/__openerp__.py +++ b/addons/base_calendar/__openerp__.py @@ -36,6 +36,7 @@ ], "demo_xml" : [], "update_xml" : [ + 'security/calendar_security.xml', 'security/ir.model.access.csv', 'wizard/calendar_event_edit_all_view.xml', 'wizard/base_calendar_invite_attendee_view.xml', diff --git a/addons/base_calendar/security/ir.model.access.csv b/addons/base_calendar/security/ir.model.access.csv index aa269e9ff18..9977f96141b 100644 --- a/addons/base_calendar/security/ir.model.access.csv +++ b/addons/base_calendar/security/ir.model.access.csv @@ -4,3 +4,4 @@ "access_res_alarm","res.alarm","model_res_alarm","base.group_user",1,1,1,1 "access_calendar_todo","calendar.todo","model_calendar_todo","base.group_user",1,1,1,1 "access_calendar_event","calendar.event","model_calendar_event","base.group_user",1,1,1,1 +"access_calendar_attendee_survey_user","calendar.attendee","model_calendar_attendee","base.group_survey_user",1,0,0,0 diff --git a/addons/hr_evaluation/security/ir.model.access.csv b/addons/hr_evaluation/security/ir.model.access.csv index 9852f359243..1a90b98931d 100644 --- a/addons/hr_evaluation/security/ir.model.access.csv +++ b/addons/hr_evaluation/security/ir.model.access.csv @@ -28,5 +28,5 @@ "access_survey_question_column_heading_hr_user","survey.question.column.heading.hr.user","survey.model_survey_question_column_heading","base.group_hr_user",1,0,0,0 "access_survey_response_line_hr_user","survey.response.line.hr.user","survey.model_survey_response_line","base.group_hr_user",1,1,1,0 "access_survey_tbl_column_heading_hr_user","survey.tbl.column.heading.hr.user","survey.model_survey_tbl_column_heading","base.group_hr_user",1,1,1,0 -"access_base_calendar_attendee_survey_user","base.calendar.calendar.attendee.survey.user","base_calendar.model_calendar_attendee","survey.group_survey_user",1,1,1,0 +"access_base_calendar_attendee_survey_user","base.calendar.calendar.attendee.survey.user","base_calendar.model_calendar_attendee","base.group_survey_user",1,1,1,0 "access_base_calendar_attendee_tool_user","base.calendar.calendar.attendee.tool.user","base_calendar.model_calendar_attendee","base.group_tool_user",1,1,1,0 diff --git a/addons/survey/security/ir.model.access.csv b/addons/survey/security/ir.model.access.csv index 1a1c8cab818..85bd76ba4be 100644 --- a/addons/survey/security/ir.model.access.csv +++ b/addons/survey/security/ir.model.access.csv @@ -25,13 +25,13 @@ "access_survey_response_line_user","survey.response.line user","model_survey_response_line","base.group_tool_user",1,1,1,1 "access_survey_res_partner_address_user","survey.res.partner.address.user","base.model_res_partner_address","base.group_tool_user",1,1,1,0 "access_survey_res_partner_user","survey.res.partner.user","base.model_res_partner","base.group_tool_user",1,1,1,1 -"access_survey_survey_user","survey.survey.user","model_survey","group_survey_user",1,1,1,1 -"access_survey_page_survey_user","survey.page.survey.user","model_survey_page","group_survey_user",1,1,1,1 -"access_survey_question_survey_user","survey.question.survey.user","model_survey_question","group_survey_user",1,1,1,1 -"access_survey_answer_survey_user","survey.answer.survey.user","model_survey_answer","group_survey_user",1,1,1,1 -"access_survey_response_survey_user","survey.response.survey.user","model_survey_response","group_survey_user",1,1,1,1 -"access_survey_response_answer_survey_user","survey.response.answer.survey.user","model_survey_response_answer","group_survey_user",1,1,1,1 -"access_survey_history_survey_user","survey.history.survey.user","model_survey_history","group_survey_user",1,1,1,1 -"access_survey_response_line_survey_user","survey.response.line.survey.user","model_survey_response_line","group_survey_user",1,1,1,1 -"access_survey_question_column_heading_survey_user","survey.question.column.heading.survey.user","model_survey_question_column_heading","group_survey_user",1,0,0,0 +"access_survey_survey_user","survey.survey.user","model_survey","base.group_survey_user",1,1,1,1 +"access_survey_page_survey_user","survey.page.survey.user","model_survey_page","base.group_survey_user",1,1,1,1 +"access_survey_question_survey_user","survey.question.survey.user","model_survey_question","base.group_survey_user",1,1,1,1 +"access_survey_answer_survey_user","survey.answer.survey.user","model_survey_answer","base.group_survey_user",1,1,1,1 +"access_survey_response_survey_user","survey.response.survey.user","model_survey_response","base.group_survey_user",1,1,1,1 +"access_survey_response_answer_survey_user","survey.response.answer.survey.user","model_survey_response_answer","base.group_survey_user",1,1,1,1 +"access_survey_history_survey_user","survey.history.survey.user","model_survey_history","base.group_survey_user",1,1,1,1 +"access_survey_response_line_survey_user","survey.response.line.survey.user","model_survey_response_line","base.group_survey_user",1,1,1,1 +"access_survey_question_column_heading_survey_user","survey.question.column.heading.survey.user","model_survey_question_column_heading","base.group_survey_user",1,0,0,0 "access_survey_question_column_heading_user","survey.question.column.heading user","model_survey_question_column_heading","base.group_tool_user",1,1,1,1 diff --git a/addons/survey/security/survey_security.xml b/addons/survey/security/survey_security.xml index 1506fdaec1b..e76f5bce1f5 100644 --- a/addons/survey/security/survey_security.xml +++ b/addons/survey/security/survey_security.xml @@ -1,19 +1,14 @@ - - - - Sales / User - - - Tools / Manager - - - Tools / User - - - Survey / User - - - + + + Tools / Manager + + + Tools / User + + + Survey / User + + diff --git a/addons/survey/survey_demo.xml b/addons/survey/survey_demo.xml index 2b9b00e64db..fce77c02137 100644 --- a/addons/survey/survey_demo.xml +++ b/addons/survey/survey_demo.xml @@ -3,7 +3,7 @@ - + diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml index ab8d50323d9..ee04954f500 100644 --- a/addons/survey/survey_view.xml +++ b/addons/survey/survey_view.xml @@ -1,11 +1,11 @@ - + - + @@ -1194,7 +1194,7 @@ src_model="survey.question"/> + action="action_view_survey_name" parent="menu_answer_surveys" groups="base.group_tool_user,base.group_tool_manager,base.group_survey_user" icon="STOCK_INDEX"/> diff --git a/addons/survey/wizard/survey_send_invitation.py b/addons/survey/wizard/survey_send_invitation.py index 361f7388f6f..98a4aeadf1e 100644 --- a/addons/survey/wizard/survey_send_invitation.py +++ b/addons/survey/wizard/survey_send_invitation.py @@ -104,7 +104,7 @@ class survey_send_invitation(osv.osv_memory): survey_ref= self.pool.get('survey') model_data_obj = self.pool.get('ir.model.data') - group_id = model_data_obj._get_id(cr, uid, 'survey', 'group_survey_user') + group_id = model_data_obj._get_id(cr, uid, 'base', 'group_survey_user') group_id = model_data_obj.browse(cr, uid, group_id, context=context).res_id act_id = self.pool.get('ir.actions.act_window')