odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[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
This commit is contained in:
Jigar Amin 2011-03-08 18:29:11 +05:30
parent 1e681a15bc
commit 4c0cd7b7ed
8 changed files with 28 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
addons/base_calendar/__openerp__.py
View File

@ -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',

1
addons/base_calendar/security/ir.model.access.csv
View File

@ -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

1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
4 access_res_alarm res.alarm model_res_alarm base.group_user 1 1 1 1
5 access_calendar_todo calendar.todo model_calendar_todo base.group_user 1 1 1 1
6 access_calendar_event calendar.event model_calendar_event base.group_user 1 1 1 1
7 access_calendar_attendee_survey_user calendar.attendee model_calendar_attendee base.group_survey_user 1 0 0 0

2
addons/hr_evaluation/security/ir.model.access.csv
View File

@ -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

1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
28 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
29 access_survey_response_line_hr_user survey.response.line.hr.user survey.model_survey_response_line base.group_hr_user 1 1 1 0
30 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
31 access_base_calendar_attendee_survey_user base.calendar.calendar.attendee.survey.user base_calendar.model_calendar_attendee survey.group_survey_user base.group_survey_user 1 1 1 0
32 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

18
addons/survey/security/ir.model.access.csv
View File

@ -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

1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
25 access_survey_response_line_user survey.response.line user model_survey_response_line base.group_tool_user 1 1 1 1
26 access_survey_res_partner_address_user survey.res.partner.address.user base.model_res_partner_address base.group_tool_user 1 1 1 0
27 access_survey_res_partner_user survey.res.partner.user base.model_res_partner base.group_tool_user 1 1 1 1
28 access_survey_survey_user survey.survey.user model_survey group_survey_user base.group_survey_user 1 1 1 1
29 access_survey_page_survey_user survey.page.survey.user model_survey_page group_survey_user base.group_survey_user 1 1 1 1
30 access_survey_question_survey_user survey.question.survey.user model_survey_question group_survey_user base.group_survey_user 1 1 1 1
31 access_survey_answer_survey_user survey.answer.survey.user model_survey_answer group_survey_user base.group_survey_user 1 1 1 1
32 access_survey_response_survey_user survey.response.survey.user model_survey_response group_survey_user base.group_survey_user 1 1 1 1
33 access_survey_response_answer_survey_user survey.response.answer.survey.user model_survey_response_answer group_survey_user base.group_survey_user 1 1 1 1
34 access_survey_history_survey_user survey.history.survey.user model_survey_history group_survey_user base.group_survey_user 1 1 1 1
35 access_survey_response_line_survey_user survey.response.line.survey.user model_survey_response_line group_survey_user base.group_survey_user 1 1 1 1
36 access_survey_question_column_heading_survey_user survey.question.column.heading.survey.user model_survey_question_column_heading group_survey_user base.group_survey_user 1 0 0 0
37 access_survey_question_column_heading_user survey.question.column.heading user model_survey_question_column_heading base.group_tool_user 1 1 1 1

27
addons/survey/security/survey_security.xml
View File

@ -1,19 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data noupdate="0">
<record id="base.group_sale_salesman" model="res.groups">
<field name="name">Sales / User</field>
</record>
<record model="res.groups" id="base.group_tool_manager">
<field name="name">Tools / Manager</field>
</record>
<record model="res.groups" id="base.group_tool_user">
<field name="name">Tools / User</field>
</record>
<record model="res.groups" id="group_survey_user">
<field name="name">Survey / User</field>
</record>
</data>
<data noupdate="0">
<record model="res.groups" id="base.group_tool_manager">
<field name="name">Tools / Manager</field>
</record>
<record model="res.groups" id="base.group_tool_user">
<field name="name">Tools / User</field>
</record>
<record model="res.groups" id="base.group_survey_user">
<field name="name">Survey / User</field>
</record>
</data>
</openerp>

2
addons/survey/survey_demo.xml
View File

@ -3,7 +3,7 @@
<data noupdate="1">
<record id="base.user_demo" model="res.users">
<field eval="[(4, ref('base.group_sale_salesman')),(4, ref('base.group_tool_user')),(4, ref('group_survey_user'))]" name="groups_id"/>
<field eval="[(4, ref('base.group_tool_user')),(4, ref('group_survey_user'))]" name="groups_id"/>
</record>
<record model="survey.type" id="survey_type1">

6
addons/survey/survey_view.xml
View File

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<menuitem name="Surveys" id="menu_surveys" parent="base.menu_tools" sequence="2" groups="base.group_tool_user,base.group_tool_manager,group_survey_user"/>
<menuitem name="Surveys" id="menu_surveys" parent="base.menu_tools" sequence="2" groups="base.group_tool_user,base.group_tool_manager,base.group_survey_user"/>
<menuitem name="Define Surveys" id="menu_define_survey"
groups="base.group_tool_manager"
parent="menu_surveys" />
<menuitem id="menu_answer_surveys" name="Answer Surveys" parent="menu_surveys" groups="base.group_tool_user,base.group_tool_manager,group_survey_user"/>
<menuitem id="menu_answer_surveys" name="Answer Surveys" parent="menu_surveys" groups="base.group_tool_user,base.group_tool_manager,base.group_survey_user"/>
<menuitem name="Reporting" parent="base.menu_tools"
id="base.menu_lunch_reporting" sequence="6"/>
<menuitem name="Surveys" id="menu_reporting" parent="base.menu_lunch_reporting" sequence="2"/>
@ -1194,7 +1194,7 @@
src_model="survey.question"/>
<menuitem name="Answer a Survey" id="menu_run_survey_form" sequence="2"
action="action_view_survey_name" parent="menu_answer_surveys" groups="base.group_tool_user,base.group_tool_manager,group_survey_user" icon="STOCK_INDEX"/>
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"/>
</data>
</openerp>

2
addons/survey/wizard/survey_send_invitation.py
View File

@ -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')