Merge lp:~fabien-morin/unifield-server/fm-sync_server_security into lp:unifield-server
- fm-sync_server_security
- Merge into trunk
Proposed by
jftempo
Status: | Merged |
---|---|
Merged at revision: | 4089 |
Proposed branch: | lp:~fabien-morin/unifield-server/fm-sync_server_security |
Merge into: | lp:unifield-server |
Diff against target: |
294 lines (+166/-24) 9 files modified
bin/addons/msf_profile/data/patches.xml (+4/-0) bin/addons/msf_profile/msf_profile.py (+23/-1) bin/addons/sync_server/__openerp__.py (+5/-2) bin/addons/sync_server/message_view.xml (+2/-1) bin/addons/sync_server/rules_view.xml (+7/-3) bin/addons/sync_server/security/ir.model.access.csv (+35/-8) bin/addons/sync_server/sync_server_menu.xml (+71/-0) bin/addons/sync_server/sync_server_view.xml (+17/-8) bin/addons/sync_server/update_view.xml (+2/-1) |
To merge this branch: | bzr merge lp:~fabien-morin/unifield-server/fm-sync_server_security |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
UniField Reviewer Team | Pending | ||
Review via email: mp+311585@code.launchpad.net |
Commit message
Description of the change
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'bin/addons/msf_profile/data/patches.xml' |
2 | --- bin/addons/msf_profile/data/patches.xml 2016-11-18 16:55:41 +0000 |
3 | +++ bin/addons/msf_profile/data/patches.xml 2016-11-25 16:46:08 +0000 |
4 | @@ -1,6 +1,10 @@ |
5 | <?xml version="1.0" encoding="utf-8" ?> |
6 | <openerp> |
7 | <data> |
8 | + <record id="setup_security_on_sync_server" model="patch.scripts"> |
9 | + <field name="method">setup_security_on_sync_server</field> |
10 | + </record> |
11 | + |
12 | <record id="us_1482" model="patch.scripts"> |
13 | <field name="method">us_1482_fix_default_code_on_msf_lines</field> |
14 | </record> |
15 | |
16 | === modified file 'bin/addons/msf_profile/msf_profile.py' |
17 | --- bin/addons/msf_profile/msf_profile.py 2016-11-18 16:55:41 +0000 |
18 | +++ bin/addons/msf_profile/msf_profile.py 2016-11-25 16:46:08 +0000 |
19 | @@ -46,6 +46,29 @@ |
20 | 'model': lambda *a: 'patch.scripts', |
21 | } |
22 | |
23 | + def setup_security_on_sync_server(self, cr, uid, *a, **b): |
24 | + update_module = self.pool.get('sync.server.update') |
25 | + if not update_module: |
26 | + # this script is exucuted on server side, update the first delete |
27 | + return |
28 | + |
29 | + data_obj = self.pool.get('ir.model.data') |
30 | + group_id = data_obj.get_object_reference(cr, uid, 'base', |
31 | + 'group_erp_manager')[1] |
32 | + |
33 | + model_obj = self.pool.get('ir.model') |
34 | + model_list_not_to_change = ['res.users', 'res.lang', 'res.widget', |
35 | + 'res.widget.user', 'res.log', 'publisher_warranty.contract', |
36 | + 'module.module'] |
37 | + model_ids = model_obj.search(cr, uid, |
38 | + [('model', 'not like', "ir%"), |
39 | + ('model', 'not in', model_list_not_to_change)]) |
40 | + |
41 | + access_obj = self.pool.get('ir.model.access') |
42 | + no_group_access = access_obj.search(cr, uid, [('group_id', '=', False), |
43 | + ('model_id', 'in', model_ids)]) |
44 | + access_obj.write(cr, uid, no_group_access, {'group_id': group_id}) |
45 | + |
46 | def us_1482_fix_default_code_on_msf_lines(self, cr, uid, *a, **b): |
47 | """ |
48 | If the default code set on the MSR lines is different from the |
49 | @@ -144,7 +167,6 @@ |
50 | (tuple(ids_chunk),)) |
51 | start_chunk += chunk_size |
52 | |
53 | - |
54 | def us_1388_change_sequence_implementation(self, cr, uid, *a, **b): |
55 | """ |
56 | change the implementation of the finance.ocb.export ir_sequence to be |
57 | |
58 | === modified file 'bin/addons/sync_server/__openerp__.py' |
59 | --- bin/addons/sync_server/__openerp__.py 2016-11-09 09:03:48 +0000 |
60 | +++ bin/addons/sync_server/__openerp__.py 2016-11-25 16:46:08 +0000 |
61 | @@ -29,8 +29,11 @@ |
62 | """, |
63 | 'author': 'OpenERP SA', |
64 | 'website': 'http://openerp.com', |
65 | - 'depends': ['sync_common', 'msf_tools'], |
66 | - 'init_xml': [], |
67 | + 'depends': ['sync_common', 'msf_tools', 'useability_dashboard_and_menu', |
68 | + 'sync_client', 'product_attributes', 'sale_override'], |
69 | + 'init_xml': [ |
70 | + 'sync_server_menu.xml', |
71 | + ], |
72 | 'data': [ |
73 | 'sync_server_view.xml', |
74 | 'update_view.xml', |
75 | |
76 | === modified file 'bin/addons/sync_server/message_view.xml' |
77 | --- bin/addons/sync_server/message_view.xml 2016-10-03 14:36:09 +0000 |
78 | +++ bin/addons/sync_server/message_view.xml 2016-11-25 16:46:08 +0000 |
79 | @@ -78,7 +78,8 @@ |
80 | </record> |
81 | |
82 | <menuitem id="message_menu_id" name="Message Monitor" |
83 | - parent="mon_menu" action="message_action"/> |
84 | + groups="base.group_erp_manager" |
85 | + parent="mon_menu" action="message_action"/> |
86 | |
87 | </data> |
88 | </openerp> |
89 | |
90 | === modified file 'bin/addons/sync_server/rules_view.xml' |
91 | --- bin/addons/sync_server/rules_view.xml 2015-11-23 14:38:46 +0000 |
92 | +++ bin/addons/sync_server/rules_view.xml 2016-11-25 16:46:08 +0000 |
93 | @@ -242,13 +242,17 @@ |
94 | <field name="context">{'search_default_all' : 1}</field> |
95 | </record> |
96 | |
97 | - <menuitem id="rules_menu" name="Rules" parent="sync_menu" sequence="20"/> |
98 | + <menuitem id="rules_menu" name="Rules" parent="sync_menu" |
99 | + groups="base.group_erp_manager" |
100 | + sequence="20"/> |
101 | |
102 | <menuitem id="sync_rule_menu" name="Data Synchronization Rules" parent="rules_menu" |
103 | - action="sync_rule_action" /> |
104 | + groups="base.group_erp_manager" |
105 | + action="sync_rule_action" /> |
106 | |
107 | <menuitem id="message_rule_menu" name="Messages Rules" parent="rules_menu" |
108 | - action="message_rule_action" /> |
109 | + groups="base.group_erp_manager" |
110 | + action="message_rule_action" /> |
111 | |
112 | |
113 | <record model="ir.ui.view" id="rule_validation_view"> |
114 | |
115 | === modified file 'bin/addons/sync_server/security/ir.model.access.csv' |
116 | --- bin/addons/sync_server/security/ir.model.access.csv 2012-08-03 14:51:30 +0000 |
117 | +++ bin/addons/sync_server/security/ir.model.access.csv 2016-11-25 16:46:08 +0000 |
118 | @@ -1,9 +1,36 @@ |
119 | "id","name","model_id","perm_read","perm_write","perm_create","perm_unlink","group_id/id" |
120 | -"sync_read_group_id","sync_read_group","sync.server.entity_group","True","","","","sync_common.sync_read_group" |
121 | -"sync_read_group_type_id","sync_read_group_type","sync.server.group_type","True","","","","sync_common.sync_read_group" |
122 | -"sync_read_group_entity_id","sync_read_group_entity","sync.server.entity","True","","","","sync_common.sync_read_group" |
123 | -"sync_read_sync_rule_id","sync_read_sync_rule","sync_server.sync_rule","True","","","","sync_common.sync_read_group" |
124 | -"sync_read_sync_update_id","sync_read_sync_update","sync.server.update","True","","","","sync_common.sync_read_group" |
125 | -"sync_read_message_rule_id","sync_read_message_rule","sync_server.message_rule","True","","","","sync_common.sync_read_group" |
126 | -"sync_read_message_id","sync_read_message","sync.server.message","True","","","","sync_common.sync_read_group" |
127 | - |
128 | +"sync_read_sync_server_entity_group_id","sync_server_entity_user sync","sync.server.entity_group",1,0,0,0,"sync_common.sync_read_group" |
129 | +"sync_read_group_type","read_group_user sync","sync.server.group_type",1,0,0,0,"sync_common.sync_read_group" |
130 | +"sync_read_sync_server_entity","sync_read_sync_server_entity_user sync","sync.server.entity",1,1,1,1,"sync_common.sync_read_group" |
131 | +"sync_read_sync_server_entity_activity","sync_read_sync_server_entity_activity_user sync","sync.server.entity.activity",1,1,1,1,"sync_common.sync_read_group" |
132 | +"sync_read_sync_rule_id","sync_read_sync_rule","sync_server.sync_rule",1,0,0,0,"sync_common.sync_read_group" |
133 | +"sync_read_sync_update_id","sync_read_sync_update","sync.server.update",1,0,0,0,"sync_common.sync_read_group" |
134 | +"sync_read_message_rule_id","sync_read_message_rule","sync_server.message_rule",1,0,0,0,"sync_common.sync_read_group" |
135 | +"sync_read_message_id","sync_read_message","sync.server.message",1,0,0,0,"sync_common.sync_read_group" |
136 | +"access_module_ir_module_user_all","module_ir_module_user all","ir.module.module",1,0,0,0, |
137 | +"access_publisher_waranty_user_all","publisher_waranty_user all","publisher_warranty.contract",1,0,0,0, |
138 | +"access_ir_act_window_user_all","ir_act_window_user all","ir.actions.act_window",1,0,0,0, |
139 | +"access_ir_ui_view_user_all","ir_ui_view_user all","ir.ui.view",1,0,0,0, |
140 | +"access_ir_action_server_user_all","ir_action_server_user all","ir.actions.server",1,0,0,0, |
141 | +"access_res_widget_user_user_all","res_widget_user_user all","res.widget.user",1,0,0,0, |
142 | +"access_res_log_user_all","res_log_user all","res.log",1,0,0,0, |
143 | +"access_ir_ui_menu_user_all","ir_ui_menu_user all","ir.ui.menu",1,0,0,0, |
144 | +"access_sync_client_register_entity_user_all","sync_client_register_entity_user all","sync.client.register_entity",1,1,1,1,"sync_common.sync_read_group" |
145 | +"access_sync_client_update_entity_user_all","sync_client_update_entity_user all","sync.client.update_entity",1,1,1,1,"sync_common.sync_read_group" |
146 | +"access_sync_client_view_entity_id_user_all","sync_client_view_entity_id_user all","sync.client.view_entity_id",1,1,1,1,"sync_common.sync_read_group" |
147 | +"access_res_company_user_all","res_company_user all","res.company",1,0,0,0, |
148 | +"access_ir_actions_act_window_view_user_all","ir_actions_act_window_view_user all","ir.actions.act_window.view",1,0,0,0, |
149 | +"access_ir_filters_user_all","ir_filters_user all","ir.filters",1,0,0,0, |
150 | +"access_process_process_user_all","ir_process_process_user all","process.process",1,0,0,0, |
151 | +"access_process_node_user_all","ir_process_node_user all","process.node",1,0,0,0, |
152 | +"access_ir_attachment_user_all","ir_attachment_user all","ir.attachment",1,0,0,0, |
153 | +"access_ir_ui_view_sc_user_all","ir_ui_view_sc_user all","ir.ui.view_sc",1,0,0,0, |
154 | +"access_board_board_user_all","board_board_user all","board.board",1,0,0,0, |
155 | +"access_ir_ui_view_custom_user_all","ir_ui_view_custom_user all","ir.ui.view.custom",1,0,0,0, |
156 | +"access_ir_actions_actions_user_all","ir_actions_actions_user all","ir.actions.actions",1,0,0,0, |
157 | +"access_res_log_report_user_all","res_log_report_user all","res.log.report",1,0,0,0, |
158 | +"access_ir_actions_report_xml_user_all","ir_actions_report_xml_user all","ir.actions.report.xml",1,0,0,0, |
159 | +"access_ir_audittrail_log_line_user_all","ir_audittrail_log_line_user all","audittrail.log.line",1,1,1,1,"sync_common.sync_read_group" |
160 | +"access_ir_mode_data_user_all","ir_model_data_user all","ir.model.data",1,1,1,1,"sync_common.sync_read_group" |
161 | +"access_res_users_user_all","res_users_user all","res.users",1,0,0,0, |
162 | +"access_ir_translation_user_all","ir_translation_user all","ir.translation",1,0,0,0, |
163 | |
164 | === added file 'bin/addons/sync_server/sync_server_menu.xml' |
165 | --- bin/addons/sync_server/sync_server_menu.xml 1970-01-01 00:00:00 +0000 |
166 | +++ bin/addons/sync_server/sync_server_menu.xml 2016-11-25 16:46:08 +0000 |
167 | @@ -0,0 +1,71 @@ |
168 | +<?xml version="1.0" encoding="utf-8"?> |
169 | +<openerp> |
170 | + <data> |
171 | + <menuitem id="sale_override.menu_localisation" |
172 | + parent="base.menu_administration" |
173 | + groups="base.group_extended"/> |
174 | + <menuitem id="base.menu_administration" |
175 | + groups="sync_common.sync_read_group"/> |
176 | + <menuitem id="base.menu_administration_shortcut" |
177 | + groups="base.group_erp_manager" |
178 | + parent="base.menu_administration"/> |
179 | + <menuitem id="base.menu_custom" |
180 | + parent="base.menu_administration" |
181 | + groups="base.group_extended"/> |
182 | + <menuitem id="base.next_id_4" |
183 | + parent="base.menu_custom" |
184 | + groups="base.group_erp_manager"/> |
185 | + <menuitem id="base.menu_low_workflow" |
186 | + groups="base.group_erp_manager" |
187 | + parent="base.next_id_4"/> |
188 | + <menuitem id="base.menu_custom_action" |
189 | + parent="base.menu_custom" |
190 | + groups="base.group_extended"/> |
191 | + <menuitem id="base.menu_config" |
192 | + groups="base.group_erp_manager" |
193 | + parent="base.menu_administration"/> |
194 | + <menuitem id="base.menu_translation" |
195 | + groups="base.group_erp_manager" |
196 | + parent="base.menu_administration"/> |
197 | + <menuitem id="base.menu_translation_app" |
198 | + parent="base.menu_translation" |
199 | + groups="base.group_extended"/> |
200 | + <menuitem id="base.menu_translation_export" |
201 | + groups="base.group_extended" |
202 | + parent="base.menu_translation"/> |
203 | + <menuitem id="base.menu_users" |
204 | + groups="base.group_erp_manager" |
205 | + parent="base.menu_administration"/> |
206 | + <menuitem id="base.menu_security" |
207 | + parent="base.menu_administration" |
208 | + groups="base.group_extended"/> |
209 | + <menuitem id="base.menu_management" |
210 | + parent="base.menu_administration" |
211 | + groups="base.group_extended"/> |
212 | + <menuitem id="base.reporting_menu" |
213 | + parent="base.menu_custom" |
214 | + groups="base.group_extended"/> |
215 | + <menuitem id="base.menu_reporting" |
216 | + parent="base.menu_administration" |
217 | + groups="base.group_extended"/> |
218 | + <menuitem id="base.menu_audit" |
219 | + groups="base.group_erp_manager" |
220 | + parent="base.menu_reporting"/> |
221 | + <menuitem id="base.menu_res_company_global" |
222 | + parent="base.menu_administration" |
223 | + groups="base.group_erp_manager"/> |
224 | + <menuitem id="base.publisher_warranty" |
225 | + parent="base.menu_administration" |
226 | + groups="base.group_erp_manager"/> |
227 | + <menuitem id="useability_dashboard_and_menu.menu_supply_config" |
228 | + groups="base.group_erp_manager"/> |
229 | + <menuitem id="useability_dashboard_and_menu.menu_partner" |
230 | + groups="base.group_erp_manager"/> |
231 | + <menuitem id="product_attributes.menu_main_product" |
232 | + groups="base.group_erp_manager"/> |
233 | + <menuitem id="sync_client.main_menu" |
234 | + groups="base.group_erp_manager"/> |
235 | + <menuitem id="sync_client.hq_monitor_main_menu" |
236 | + groups="base.group_erp_manager"/> |
237 | + </data> |
238 | +</openerp> |
239 | |
240 | === modified file 'bin/addons/sync_server/sync_server_view.xml' |
241 | --- bin/addons/sync_server/sync_server_view.xml 2016-11-17 16:56:18 +0000 |
242 | +++ bin/addons/sync_server/sync_server_view.xml 2016-11-25 16:46:08 +0000 |
243 | @@ -134,20 +134,29 @@ |
244 | |
245 | |
246 | |
247 | - <menuitem id="sync_menu" name="Synchronization" parent="base.menu_administration" sequence="0"/> |
248 | - |
249 | - <menuitem id="mon_menu" name="Monitoring" parent="sync_menu" sequence="10"/> |
250 | - |
251 | - <menuitem id="conf_menu" name="Configuration" parent="sync_menu" sequence="90"/> |
252 | + <menuitem id="sync_menu" name="Synchronization" parent="base.menu_administration" |
253 | + groups="sync_common.sync_read_group" |
254 | + sequence="0"/> |
255 | + |
256 | + <menuitem id="mon_menu" name="Monitoring" parent="sync_menu" |
257 | + groups="base.group_erp_manager" |
258 | + sequence="10"/> |
259 | + |
260 | + <menuitem id="conf_menu" name="Configuration" parent="sync_menu" |
261 | + groups="sync_common.sync_read_group" |
262 | + sequence="90"/> |
263 | |
264 | <menuitem id="entity_menu" name="Instance" parent="conf_menu" sequence="10" |
265 | - action="entity_action"/> |
266 | + groups="sync_common.sync_read_group" |
267 | + action="entity_action"/> |
268 | |
269 | <menuitem id="group_menu" name="Groups" parent="conf_menu" sequence="20" |
270 | - action="group_action"/> |
271 | + groups="base.group_erp_manager" |
272 | + action="group_action"/> |
273 | |
274 | <menuitem id="group_type_menu" name="Type of Group" parent="conf_menu" sequence="30" |
275 | - action="group_type_action"/> |
276 | + groups="base.group_erp_manager" |
277 | + action="group_type_action"/> |
278 | |
279 | </data> |
280 | </openerp> |
281 | |
282 | === modified file 'bin/addons/sync_server/update_view.xml' |
283 | --- bin/addons/sync_server/update_view.xml 2016-10-21 15:36:56 +0000 |
284 | +++ bin/addons/sync_server/update_view.xml 2016-11-25 16:46:08 +0000 |
285 | @@ -121,7 +121,8 @@ |
286 | </record> |
287 | |
288 | <menuitem id="update_menu_id" name="Data Monitor" |
289 | - parent="mon_menu" action="update_action"/> |
290 | + groups="base.group_erp_manager" |
291 | + parent="mon_menu" action="update_action"/> |
292 | |
293 | |
294 | <record model="ir.ui.view" id="sync_server_monitor_email_tree_view"> |