Unifield Web

Merge lp:~unifield-team/unifield-web/us_439 into lp:unifield-web

  1. us_439
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merge reported by: jftempo
Merged at revision: not available
Proposed branch: lp:~unifield-team/unifield-web/us_439
Merge into: lp:unifield-web
Diff against target: 84 lines (+9/-3)
5 files modified
addons/openerp/controllers/form.py (+1/-1)
addons/openerp/controllers/templates/form.mako (+1/-1)
addons/openerp/widgets/form/_form.py (+1/-0)
addons/openerp/widgets/listgrid.py (+5/-1)
addons/openerp/widgets/screen.py (+1/-0)
To merge this branch: bzr merge lp:~unifield-team/unifield-web/us_439
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+269513@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
=== modified file 'addons/openerp/controllers/form.py'
--- addons/openerp/controllers/form.py 2015-07-30 07:16:05 +0000
+++ addons/openerp/controllers/form.py 2015-08-28 14:39:42 +0000
@@ -219,7 +219,7 @@
219 buttons = TinyDict() # toolbar219 buttons = TinyDict() # toolbar
220 buttons.new = (not editable or mode == 'tree') and mode != 'diagram' and form.screen.button_new220 buttons.new = (not editable or mode == 'tree') and mode != 'diagram' and form.screen.button_new
221 buttons.edit = not editable and (mode == 'form' or mode == 'diagram') and form.screen.button_edit221 buttons.edit = not editable and (mode == 'form' or mode == 'diagram') and form.screen.button_edit
222 buttons.save = editable and mode == 'form'222 buttons.save = editable and mode == 'form' and form.screen.button_save
223 buttons.duplicate = form.screen.button_duplicate223 buttons.duplicate = form.screen.button_duplicate
224 buttons.cancel = editable and mode == 'form'224 buttons.cancel = editable and mode == 'form'
225 buttons.delete = not editable and mode == 'form' and form.screen.button_delete225 buttons.delete = not editable and mode == 'form' and form.screen.button_delete
226226
=== modified file 'addons/openerp/controllers/templates/form.mako'
--- addons/openerp/controllers/templates/form.mako 2014-08-27 15:03:43 +0000
+++ addons/openerp/controllers/templates/form.mako 2015-08-28 14:39:42 +0000
@@ -123,7 +123,7 @@
123 <a href="javascript: void(0);" onclick="editRecord(${form.screen.id or 'null'})" class="button-a">${_("Edit")}</a>123 <a href="javascript: void(0);" onclick="editRecord(${form.screen.id or 'null'})" class="button-a">${_("Edit")}</a>
124 </li>124 </li>
125 % endif125 % endif
126 % if buttons.save:126 % if buttons.save and not form.screen.widget.hide_button_edit:
127 <li title="${_('Save this resource')}">127 <li title="${_('Save this resource')}">
128 <a href="javascript: void(0);" onclick="submit_form('save')" class="button-a">${_("Save")}</a>128 <a href="javascript: void(0);" onclick="submit_form('save')" class="button-a">${_("Save")}</a>
129 </li>129 </li>
130130
=== modified file 'addons/openerp/widgets/form/_form.py'
--- addons/openerp/widgets/form/_form.py 2014-10-07 12:31:45 +0000
+++ addons/openerp/widgets/form/_form.py 2015-08-28 14:39:42 +0000
@@ -759,6 +759,7 @@
759 self.hide_button_new = attrs.get('hide_new_button', False)759 self.hide_button_new = attrs.get('hide_new_button', False)
760 self.hide_button_delete = attrs.get('hide_delete_button', False)760 self.hide_button_delete = attrs.get('hide_delete_button', False)
761 self.hide_button_edit = attrs.get('hide_edit_button', False)761 self.hide_button_edit = attrs.get('hide_edit_button', False)
762 self.hide_button_save = attrs.get('hide_save_button', False)
762 self.link = attrs.get('link', nolinks)763 self.link = attrs.get('link', nolinks)
763 self.model = model764 self.model = model
764 self.id = None765 self.id = None
765766
=== modified file 'addons/openerp/widgets/listgrid.py'
--- addons/openerp/widgets/listgrid.py 2015-08-07 12:38:06 +0000
+++ addons/openerp/widgets/listgrid.py 2015-08-28 14:39:42 +0000
@@ -41,7 +41,8 @@
41 template = "/openerp/widgets/templates/listgrid/listgrid.mako"41 template = "/openerp/widgets/templates/listgrid/listgrid.mako"
42 params = ['name', 'data', 'columns', 'headers', 'model', 'selectable', 'editable', 'noteditable', 'resequencable',42 params = ['name', 'data', 'columns', 'headers', 'model', 'selectable', 'editable', 'noteditable', 'resequencable',
43 'pageable', 'selector', 'source', 'offset', 'limit', 'show_links', 'editors', 'view_mode',43 'pageable', 'selector', 'source', 'offset', 'limit', 'show_links', 'editors', 'view_mode',
44 'hiddens', 'edit_inline', 'field_total', 'field_real_total', 'link', 'checkbox_name', 'm2m', 'min_rows', 'string', 'o2m', 'dashboard', 'impex', 'hide_new_button', 'hide_delete_button', 'hide_edit_button', 'notselectable']44 'hiddens', 'edit_inline', 'field_total', 'field_real_total', 'link', 'checkbox_name', 'm2m', 'min_rows', 'string', 'o2m', 'dashboard', 'impex',
45 'hide_new_button', 'hide_delete_button', 'hide_edit_button', 'hive_save_button', 'notselectable']
4546
46 member_widgets = ['pager', 'buttons', 'editors', 'concurrency_info']47 member_widgets = ['pager', 'buttons', 'editors', 'concurrency_info']
4748
@@ -69,6 +70,7 @@
69 hide_new_button = False70 hide_new_button = False
70 hide_delete_button = False71 hide_delete_button = False
71 hide_edit_button = False72 hide_edit_button = False
73 hide_save_button = False
7274
73 def __init__(self, name, model, view, ids=[], domain=[], context={}, **kw):75 def __init__(self, name, model, view, ids=[], domain=[], context={}, **kw):
7476
@@ -129,10 +131,12 @@
129 self.hide_new_button = False131 self.hide_new_button = False
130 self.hide_delete_button = False132 self.hide_delete_button = False
131 self.hide_edit_button = False133 self.hide_edit_button = False
134 self.hide_save_button = False
132 try:135 try:
133 self.hide_new_button = expr_eval(attrs.get('hide_new_button', False), {'context': context})136 self.hide_new_button = expr_eval(attrs.get('hide_new_button', False), {'context': context})
134 self.hide_delete_button = expr_eval(attrs.get('hide_delete_button', False), {'context': context})137 self.hide_delete_button = expr_eval(attrs.get('hide_delete_button', False), {'context': context})
135 self.hide_edit_button = expr_eval(attrs.get('hide_edit_button', False), {'context': context})138 self.hide_edit_button = expr_eval(attrs.get('hide_edit_button', False), {'context': context})
139 self.hide_save_button = expr_eval(attrs.get('hide_save_button', False), {'context': context})
136 except:140 except:
137 pass141 pass
138 142
139143
=== modified file 'addons/openerp/widgets/screen.py'
--- addons/openerp/widgets/screen.py 2015-08-06 14:35:56 +0000
+++ addons/openerp/widgets/screen.py 2015-08-28 14:39:42 +0000
@@ -148,6 +148,7 @@
148 self.button_new = (self.widget or False) and view_type == 'form' and not self.widget.hide_button_new148 self.button_new = (self.widget or False) and view_type == 'form' and not self.widget.hide_button_new
149 self.button_delete = (self.widget or False) and view_type == 'form' and not self.widget.hide_button_delete149 self.button_delete = (self.widget or False) and view_type == 'form' and not self.widget.hide_button_delete
150 self.button_edit = (self.widget or False) and view_type == 'form' and not self.widget.hide_button_edit150 self.button_edit = (self.widget or False) and view_type == 'form' and not self.widget.hide_button_edit
151 self.button_save = (self.widget or False) and view_type == 'form' and not self.widget.hide_button_save
151152
152 toolbar = {}153 toolbar = {}
153 for item, value in view.get('toolbar', {}).items():154 for item, value in view.get('toolbar', {}).items():

Subscribers

People subscribed via source and target branches

to all changes: