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

Proposed by Duy VO
Status: Merged
Merge reported by: jftempo
Merged at revision: not available
Proposed branch: lp:~unifield-team/unifield-web/uf_408_remove_duplicate_button
Merge into: lp:unifield-web
Diff against target: 84 lines (+15/-20)
2 files modified
addons/openerp/controllers/form.py (+14/-19)
addons/openerp/controllers/templates/form.mako (+1/-1)
To merge this branch: bzr merge lp:~unifield-team/unifield-web/uf_408_remove_duplicate_button
Reviewer Review Type Date Requested Status
jftempo Pending
Review via email: mp+71658@code.launchpad.net

Description of the change

use a quick&dirty solution, if it's too dirty, then i will try another solution ...

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 2011-08-01 15:24:01 +0000
+++ addons/openerp/controllers/form.py 2011-08-16 10:22:26 +0000
@@ -23,13 +23,16 @@
23import cherrypy23import cherrypy
24from openerp import utils, widgets as tw, validators24from openerp import utils, widgets as tw, validators
25from openerp.controllers import SecuredController25from openerp.controllers import SecuredController
26from openerp.utils import rpc, common, TinyDict, TinyForm, expr_eval26from openerp.utils import rpc, common, TinyDict, TinyForm, expr_eval, node_attributes
27from error_page import _ep27from error_page import _ep
28from openobject.tools import expose, redirect, validate, error_handler, exception_handler28from openobject.tools import expose, redirect, validate, error_handler, exception_handler
29import openobject29import openobject
30import openobject.paths30import openobject.paths
31import simplejson31import simplejson
3232
33import xml.dom.minidom
34
35
33def make_domain(name, value, kind='char'):36def make_domain(name, value, kind='char'):
34 """A helper function to generate domain for the given name, value pair.37 """A helper function to generate domain for the given name, value pair.
35 Will be used for search window...38 Will be used for search window...
@@ -207,6 +210,13 @@
207 buttons.new = (not editable or mode == 'tree') and mode != 'diagram'210 buttons.new = (not editable or mode == 'tree') and mode != 'diagram'
208 buttons.edit = not editable and (mode == 'form' or mode == 'diagram')211 buttons.edit = not editable and (mode == 'form' or mode == 'diagram')
209 buttons.save = editable and mode == 'form'212 buttons.save = editable and mode == 'form'
213
214
215 # UF-408: A quick&dirty fix to remove the button "duplicate" in the view Periods!
216 buttons.duplicate = True
217 if params.model == "account.period":
218 buttons.duplicate = False
219
210 buttons.cancel = editable and mode == 'form'220 buttons.cancel = editable and mode == 'form'
211 buttons.delete = not editable and mode == 'form'221 buttons.delete = not editable and mode == 'form'
212 buttons.pager = mode == 'form' or mode == 'diagram'# Pager will visible in edit and non-edit mode in form view.222 buttons.pager = mode == 'form' or mode == 'diagram'# Pager will visible in edit and non-edit mode in form view.
@@ -287,7 +297,6 @@
287 '_terp_notebook_tab': notebook_tab})297 '_terp_notebook_tab': notebook_tab})
288 params.o2m_edit = o2m_edit298 params.o2m_edit = o2m_edit
289 params.editable = editable299 params.editable = editable
290 params.action_id = kw.get('action_id')
291300
292 if kw.get('default_date'):301 if kw.get('default_date'):
293 params.context.update({'default_date' : kw['default_date']})302 params.context.update({'default_date' : kw['default_date']})
@@ -405,24 +414,10 @@
405 params.ids = (params.ids or []) + [params.id]414 params.ids = (params.ids or []) + [params.id]
406 params.count += 1415 params.count += 1
407 else:416 else:
408 ctx = utils.context_with_concurrency_info(params.context, params.concurrency_info)417 ctx = utils.context_with_concurrency_info(params.context, params.concurrency_info)
409 if params.button and params.button.name:418 if params.button and params.button.name:
410 ctx.update({'button': params.button.name})419 ctx.update({'button': params.button.name})
411 420 Model.write([params.id], data, ctx)
412 #original_data = Model.read(params.id, data.keys())
413 #modified = {}
414
415 #if original_data and isinstance(original_data, dict):
416 # for field, original_value in original_data.iteritems():
417 # if isinstance(original_value, tuple):
418 # original_data[field] = original_value[0]
419 # if field in data and data[field] != original_data[field]:
420 # modified[field] = data[field]
421
422 # Model.write([params.id], modified, ctx)
423 #else:
424 # Model.write([params.id], data, ctx)
425 Model.write([params.id], data, ctx)
426421
427 tw.ConcurrencyInfo.update(422 tw.ConcurrencyInfo.update(
428 params.model, Model.read([params.id], ['__last_update'], ctx)423 params.model, Model.read([params.id], ['__last_update'], ctx)
429424
=== modified file 'addons/openerp/controllers/templates/form.mako'
--- addons/openerp/controllers/templates/form.mako 2011-01-21 09:36:34 +0000
+++ addons/openerp/controllers/templates/form.mako 2011-08-16 10:22:26 +0000
@@ -125,7 +125,7 @@
125 <a href="javascript: void(0);" onclick="submit_form('save_and_edit')" class="button-a">${_("Save & Edit")}</a>125 <a href="javascript: void(0);" onclick="submit_form('save_and_edit')" class="button-a">${_("Save & Edit")}</a>
126 </li>126 </li>
127 % endif127 % endif
128 % if buttons.edit and form.screen.view_type== 'form':128 % if buttons.edit and form.screen.view_type== 'form' and buttons.duplicate:
129 <li title="${_('Duplicate this resource')}">129 <li title="${_('Duplicate this resource')}">
130 <a href="javascript: void(0);" onclick="submit_form('duplicate')" class="button-a">${_("Duplicate")}</a>130 <a href="javascript: void(0);" onclick="submit_form('duplicate')" class="button-a">${_("Duplicate")}</a>
131 </li>131 </li>

Subscribers

People subscribed via source and target branches

to all changes: