Unifield Web

Merge lp:~julie-w/unifield-web/US-3030 into lp:unifield-web

  1. US-3030
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 4912
Proposed branch: lp:~julie-w/unifield-web/US-3030
Merge into: lp:unifield-web
Diff against target: 36 lines (+3/-1)
3 files modified
addons/openerp/controllers/form.py (+1/-1)
addons/openerp/widgets/form/_form.py (+1/-0)
addons/openerp/widgets/screen.py (+1/-0)
To merge this branch: bzr merge lp:~julie-w/unifield-web/US-3030
Reviewer Review Type Date Requested Status
UniField Dev Team Pending
Review via email: mp+342564@code.launchpad.net
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 'addons/openerp/controllers/form.py'
2--- addons/openerp/controllers/form.py 2018-02-26 09:13:17 +0000
3+++ addons/openerp/controllers/form.py 2018-04-03 10:30:51 +0000
4@@ -221,7 +221,7 @@
5 buttons.edit = not editable and (mode == 'form' or mode == 'diagram') and form.screen.button_edit
6 buttons.save = editable and mode == 'form' and form.screen.button_save
7 buttons.duplicate = form.screen.button_duplicate
8- buttons.cancel = editable and mode == 'form'
9+ buttons.cancel = editable and mode == 'form' and form.screen.button_cancel
10 buttons.delete = not editable and mode == 'form' and form.screen.button_delete
11 buttons.pager = mode == 'form' or mode == 'diagram'# Pager will visible in edit and non-edit mode in form view.
12 buttons.can_attach = id and mode == 'form'
13
14=== modified file 'addons/openerp/widgets/form/_form.py'
15--- addons/openerp/widgets/form/_form.py 2018-03-15 13:18:00 +0000
16+++ addons/openerp/widgets/form/_form.py 2018-04-03 10:30:51 +0000
17@@ -799,6 +799,7 @@
18 self.hide_button_delete = attrs.get('hide_delete_button', False)
19 self.hide_button_edit = attrs.get('hide_edit_button', False)
20 self.hide_button_save = attrs.get('hide_save_button', False)
21+ self.hide_button_cancel = attrs.get('hide_cancel_button', False)
22 self.noteditable = False
23 self.link = attrs.get('link', nolinks)
24 self.model = model
25
26=== modified file 'addons/openerp/widgets/screen.py'
27--- addons/openerp/widgets/screen.py 2018-02-02 13:13:22 +0000
28+++ addons/openerp/widgets/screen.py 2018-04-03 10:30:51 +0000
29@@ -154,6 +154,7 @@
30 self.button_delete = (self.widget or False) and view_type == 'form' and not self.widget.hide_button_delete
31 self.button_edit = (self.widget or False) and view_type == 'form' and not self.widget.hide_button_edit
32 self.button_save = (self.widget or False) and view_type == 'form' and not self.widget.hide_button_save
33+ self.button_cancel = (self.widget or False) and view_type == 'form' and not self.widget.hide_button_cancel
34
35 toolbar = {}
36 for item, value in view.get('toolbar', {}).items():

Subscribers

People subscribed via source and target branches