Unifield Web

Merge lp:~jfb-tempo-consulting/unifield-web/US-5271 into lp:unifield-web

  1. US-5271
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 4994
Proposed branch: lp:~jfb-tempo-consulting/unifield-web/US-5271
Merge into: lp:unifield-web
Diff against target: 241 lines (+63/-13) (has conflicts)
9 files modified
addons/openerp/controllers/actions.py (+6/-2)
addons/openerp/controllers/form.py (+2/-0)
addons/openerp/controllers/templates/base.mako (+2/-2)
addons/openerp/controllers/templates/closepopup.mako (+12/-1)
addons/openerp/static/javascript/form.js (+32/-3)
addons/openerp/static/javascript/openerp/openerp.base.js (+4/-1)
addons/openerp/widgets/form/_form.py (+2/-1)
addons/openerp/widgets/form/templates/button.mako (+1/-1)
addons/openerp/widgets/templates/listgrid/listgrid.mako (+2/-2)
Text conflict in addons/openerp/static/javascript/form.js
To merge this branch: bzr merge lp:~jfb-tempo-consulting/unifield-web/US-5271
Reviewer Review Type Date Requested Status
UniField Dev Team Pending
Review via email: mp+386342@code.launchpad.net
To post a comment you must log in.
lp:~jfb-tempo-consulting/unifield-web/US-5271 updated
4993. By jftempo

IN processing wizard: prevent double click on copy_all / uncopy_all

4994. By jftempo

JS cache

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'addons/openerp/controllers/actions.py'
2--- addons/openerp/controllers/actions.py 2019-07-22 07:22:14 +0000
3+++ addons/openerp/controllers/actions.py 2020-07-31 08:39:10 +0000
4@@ -270,6 +270,9 @@
5 def act_window_close(action=False, *args, **b):
6 return close_popup(o2m_refresh=action.get('o2m_refresh'))
7
8+def refresh_popupo2m(action=False, *args, **b):
9+ return close_popup(o2m_refresh=action.get('o2m_refresh'), frompopup=True)
10+
11 def refresh_o2m(action=False, *a, **b):
12 cherrypy.response.headers['Content-Type'] = 'text/javascript'
13 import json
14@@ -408,6 +411,7 @@
15 ))
16
17 ACTIONS_BY_TYPE = {
18+ 'ir.actions.refresh_popupo2m': refresh_popupo2m,
19 'ir.actions.refresh_o2m': refresh_o2m,
20 'ir.actions.act_window_close': act_window_close,
21 'ir.actions.act_window': act_window,
22@@ -590,7 +594,7 @@
23
24
25 @tools.expose(template="/openerp/controllers/templates/closepopup.mako")
26-def close_popup(reload=True, o2m_refresh=False):
27+def close_popup(reload=True, o2m_refresh=False, frompopup=False):
28 """ Closes an opened dialog box or popup.
29
30 :param reload: whether the background view should be reloaded when closing the popup
31@@ -603,7 +607,7 @@
32 if getattr(cherrypy.request, 'params', []):
33 if getattr(cherrypy.request.params, 'context', {}):
34 active_id = cherrypy.request.params.context.get('active_id')
35- return {'reload': reload, 'active_id': active_id, 'o2m_refresh': o2m_refresh}
36+ return {'reload': reload, 'active_id': active_id, 'o2m_refresh': o2m_refresh, 'frompopup': frompopup}
37
38 @tools.expose(template="/openerp/controllers/templates/report.mako")
39 def report_link(report_name, **kw):
40
41=== modified file 'addons/openerp/controllers/form.py'
42--- addons/openerp/controllers/form.py 2019-08-08 13:04:49 +0000
43+++ addons/openerp/controllers/form.py 2020-07-31 08:39:10 +0000
44@@ -708,6 +708,8 @@
45 if params.button.selected_ids:
46 s_ids = params.button.selected_ids if isinstance(params.button.selected_ids, list) else [params.button.selected_ids]
47 ctx['button_selected_ids'] = s_ids
48+ if params.button.selected_domain:
49+ ctx['selected_domain'] = params.button.selected_domain
50 return model, id, ids, ctx
51
52 def button_action(self, params):
53
54=== modified file 'addons/openerp/controllers/templates/base.mako'
55--- addons/openerp/controllers/templates/base.mako 2020-03-11 11:07:59 +0000
56+++ addons/openerp/controllers/templates/base.mako 2020-07-31 08:39:10 +0000
57@@ -1,14 +1,14 @@
58 <%inherit file="/openobject/controllers/templates/base.mako"/>
59
60 <%def name="header()">
61- <script type="text/javascript" src="/openerp/static/javascript/openerp/openerp.base.js?v=14.0"></script>
62+ <script type="text/javascript" src="/openerp/static/javascript/openerp/openerp.base.js?v=18.0"></script>
63 <script type="text/javascript" src="/openerp/static/javascript/openerp/openerp.ui.js"></script>
64 <script type="text/javascript" src="/openerp/static/javascript/openerp/openerp.ui.tips.js"></script>
65 <script type="text/javascript" src="/openerp/static/javascript/openerp/openerp.ui.waitbox.js"></script>
66 <script type="text/javascript" src="/openerp/static/javascript/openerp/openerp.ui.textarea.js"></script>
67
68 <script type="text/javascript" src="/openerp/static/javascript/scripts.js"></script>
69- <script type="text/javascript" src="/openerp/static/javascript/form.js?v=16.0"></script>
70+ <script type="text/javascript" src="/openerp/static/javascript/form.js?v=18.0"></script>
71 <script type="text/javascript" src="/openerp/static/javascript/form_state.js?v=16.0"></script>
72 <script type="text/javascript" src="/openerp/static/javascript/listgrid.js?v=16.0"></script>
73
74
75=== modified file 'addons/openerp/controllers/templates/closepopup.mako'
76--- addons/openerp/controllers/templates/closepopup.mako 2017-01-02 14:59:00 +0000
77+++ addons/openerp/controllers/templates/closepopup.mako 2020-07-31 08:39:10 +0000
78@@ -12,7 +12,8 @@
79 <script type="text/javascript" src="/openobject/static/javascript/openobject/openobject.dom.js"></script>
80 <script type="text/javascript" src="/openobject/static/javascript/openobject/openobject.http.js"></script>
81 <script type="text/javascript" src="/openobject/static/javascript/openobject/openobject.tools.js"></script>
82-
83+ <script type="text/javascript" src="/openerp/static/javascript/openerp/openerp.ui.textarea.js"></script>
84+
85 <script type="text/javascript">
86 jQuery(document).ready(function(){
87 if(!window.opener && window.top == window) {
88@@ -21,10 +22,20 @@
89 }
90 var topWindow;
91 if(window.top != window) {
92+ % if frompopup:
93+ if (jQuery(window).attr('frameElement')) {
94+ new window.top.frames[0].ListView('${o2m_refresh}').reload()
95+ setTimeout(function () {
96+ window.frameElement.close();
97+ });
98+ return;
99+ }
100+ % else:
101 topWindow = window.top;
102 setTimeout(function () {
103 topWindow.closeAction();
104 });
105+ % endif
106 } else {
107 topWindow = window.opener;
108 setTimeout(close);
109
110=== modified file 'addons/openerp/static/javascript/form.js'
111--- addons/openerp/static/javascript/form.js 2020-04-14 10:11:38 +0000
112+++ addons/openerp/static/javascript/form.js 2020-07-31 08:39:10 +0000
113@@ -417,10 +417,11 @@
114 return relation ? new ListView(relation).go(action) : submit_form(action ? action : 'find');
115 }
116
117-function buttonClicked(name, btype, model, id, sure, target, context){
118+function buttonClicked(name, btype, model, id, sure, target, context, set_ids){
119
120 // to be able to get selected lines ids
121 s_ids = [];
122+<<<<<<< TREE
123 if (jQuery('[id="order_line"]').length > 0) {
124 s_ids = ListView('order_line').getSelectedRecords();
125 } else if (jQuery('[id="move_lines"]').length > 0){
126@@ -433,6 +434,33 @@
127 s_ids = ListView('line_ids').getSelectedRecords();
128 } else if (model =='wizard.compare.rfq' && jQuery('[id="line_ids"]').length > 0){
129 s_ids = ListView('line_ids').getSelectedRecords();
130+=======
131+ s_dom = [];
132+ if (set_ids) {
133+ if (jQuery('[id="' + set_ids + '"]').length > 0) {
134+ if ($('#'+set_ids+'_check_all').length) {
135+ // lines can be ticked
136+ s_ids = ListView(set_ids).getSelectedRecords();
137+
138+ } else {
139+ // no tickbox on lines, get the filter
140+ s_dom = openobject.dom.get(set_ids + '/_terp_domain').value;
141+ }
142+ }
143+ }
144+ else {
145+ if (jQuery('[id="order_line"]').length > 0) {
146+ s_ids = ListView('order_line').getSelectedRecords();
147+ } else if (jQuery('[id="move_lines"]').length > 0){
148+ s_ids = ListView('move_lines').getSelectedRecords();
149+ } else if (model == 'shipment' && jQuery('[id="pack_family_memory_ids"]').length > 0){
150+ s_ids = ListView('pack_family_memory_ids').getSelectedRecords();
151+ } else if (model =='replenishment.inventory.review' && jQuery('[id="line_ids"]').length > 0){
152+ s_ids = ListView('line_ids').getSelectedRecords();
153+ } else if (model =='replenishment.segment' && jQuery('[id="line_ids"]').length > 0){
154+ s_ids = ListView('line_ids').getSelectedRecords();
155+ }
156+>>>>>>> MERGE-SOURCE
157 }
158
159 if (sure && !confirm(sure.replace('%(number_selected)s',s_ids.length))) {
160@@ -444,11 +472,12 @@
161 '_terp_button/btype': btype,
162 '_terp_button/model': model,
163 '_terp_button/id': id,
164- '_terp_button/selected_ids': s_ids
165+ '_terp_button/selected_ids': s_ids,
166+ '_terp_button/selected_domain': s_dom,
167 };
168
169 // if works as expected can be extended to other buttons
170- test_double = name == 'import_file' && btype == 'object' && model == 'initial.stock.inventory'
171+ test_double = (name == 'import_file' && btype == 'object' && model == 'initial.stock.inventory') || ((name == 'copy_all' || name == 'uncopy_all') && model == 'stock.incoming.processor')
172 if (!context || context == "{}") {
173 var act = get_form_action(btype == 'cancel' ? 'cancel' : 'save', params);
174 submit_form(act, null, target, test_double);
175
176=== modified file 'addons/openerp/static/javascript/openerp/openerp.base.js'
177--- addons/openerp/static/javascript/openerp/openerp.base.js 2019-04-15 12:09:58 +0000
178+++ addons/openerp/static/javascript/openerp/openerp.base.js 2020-07-31 08:39:10 +0000
179@@ -293,7 +293,10 @@
180 $form.ajaxSubmit({
181 data: {'requested_with': 'XMLHttpRequest'},
182 success: doLoadingSuccess(jQuery('body')),
183- error: loadingError()
184+ error: loadingError(),
185+ complete: function(res, status) {
186+ $form[0].issubmitted = false;
187+ },
188 });
189 return false;
190 });
191
192=== modified file 'addons/openerp/widgets/form/_form.py'
193--- addons/openerp/widgets/form/_form.py 2020-03-18 11:08:57 +0000
194+++ addons/openerp/widgets/form/_form.py 2020-07-31 08:39:10 +0000
195@@ -690,7 +690,7 @@
196 class Button(TinyInputWidget):
197
198 template = "/openerp/widgets/form/templates/button.mako"
199- params = ["btype", "id", "confirm", "icon", "target", "context", "default_focus"]
200+ params = ["btype", "id", "confirm", "icon", "target", "context", "default_focus", "set_ids"]
201
202 visible = True
203 def __init__(self, **attrs):
204@@ -702,6 +702,7 @@
205 self.context = attrs.get("context", {})
206 self.nolabel = True
207 self.target = ''
208+ self.set_ids = attrs.get('set_ids')
209 if self.icon:
210 self.icon = icons.get_icon(self.icon)
211 self.default_focus = attrs.get('default_focus', 0)
212
213=== modified file 'addons/openerp/widgets/form/templates/button.mako'
214--- addons/openerp/widgets/form/templates/button.mako 2019-04-18 14:02:32 +0000
215+++ addons/openerp/widgets/form/templates/button.mako 2020-07-31 08:39:10 +0000
216@@ -4,7 +4,7 @@
217 type="button"
218 href="javascript: void(0)"
219 title="${help}"
220- onclick="buttonClicked('${name}', '${btype}', '${model}', '${id}', getNodeAttribute(this, 'confirm'), '${target}', getNodeAttribute(this, 'context'));"
221+ onclick="buttonClicked('${name}', '${btype}', '${model}', '${id}', getNodeAttribute(this, 'confirm'), '${target}', getNodeAttribute(this, 'context'), '${set_ids}');"
222 oncontextmenu="showBtnSdref(event, '${name}', '${model}', '${id}');"
223 style="height: 20px;"
224 ${py.attrs(attrs, confirm=confirm, context=ctx)}
225
226=== modified file 'addons/openerp/widgets/templates/listgrid/listgrid.mako'
227--- addons/openerp/widgets/templates/listgrid/listgrid.mako 2020-04-30 15:59:44 +0000
228+++ addons/openerp/widgets/templates/listgrid/listgrid.mako 2020-07-31 08:39:10 +0000
229@@ -189,10 +189,10 @@
230 </%def>
231
232 <div class="box-a list-a">
233-% if any([field != 'button' and field_attrs.get('filter_selector') for field, field_attrs in headers]):
234+% if any([field != 'button' and field_attrs.get('filter_selector') for field, field_attrs in headers+hiddens]):
235 <div class="o2m_filter_block">
236 <table id="${name}_o2m_filter" class="o2m_header_filter"><tr>
237- % for (field, field_attrs) in headers:
238+ % for (field, field_attrs) in headers+hiddens:
239 % if field != 'button' and field_attrs.get('filter_selector'):
240 <% has_filter = True %>
241 <td> ${field_attrs['string']|br}:

Subscribers

People subscribed via source and target branches