Skip to content

erp5
erp5
Commit fa704347 authored by Tomáš Peterka's avatar Tomáš Peterka Committed by Tomáš Peterka
Browse files
Options

[renderjs_ui] Lock Formbox using mutex

parent 1fecf1e3
Show whitespace changes
Inline Side-by-side
Showing with 12 additions and 26 deletions
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_field_formbox_html.html
View file @ fa704347
...@@ -13,5 +13,6 @@ ...@@ -13,5 +13,6 @@
</head> </head>
<body> <body>
<div data-gadget-url='gadget_erp5_page_form.html' data-gadget-scope='sub'></div>
</body> </body>
</html> </html>
\ No newline at end of file
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_field_formbox_html.xml
View file @ fa704347
...@@ -220,7 +220,7 @@ ...@@ -220,7 +220,7 @@
</item> </item>
<item> <item>
<key> <string>actor</string> </key> <key> <string>actor</string> </key>
<value> <string>zope</string> </value> <value> <string>superkato</string> </value>
</item> </item>
<item> <item>
<key> <string>comment</string> </key> <key> <string>comment</string> </key>
...@@ -234,7 +234,7 @@ ...@@ -234,7 +234,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>961.29269.53660.61405</string> </value> <value> <string>961.56527.16709.20804</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -252,7 +252,7 @@ ...@@ -252,7 +252,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1502977305.6</float> <float>1526316799.74</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_field_formbox_js.js
View file @ fa704347
...@@ -24,8 +24,8 @@ ...@@ -24,8 +24,8 @@
gadget = this, gadget = this,
field_json = options.field_json || {}, field_json = options.field_json || {},
new_state = { new_state = {
value: field_json.value || field_json.default || "", value: field_json.value || field_json['default'] || "",
text_content: field_json.value || field_json.default || "", text_content: field_json.value || field_json['default'] || "",
editable: field_json.editable, editable: field_json.editable,
required: field_json.required, required: field_json.required,
name: field_json.key, name: field_json.key,
...@@ -41,21 +41,6 @@ ...@@ -41,21 +41,6 @@
new_state.editable = options.editable; new_state.editable = options.editable;
} }
if (gadget.state.subgadget_template === undefined || options.reset === true) {
// render subgadget only when there is none OR render is explicitely requested
return gadget.declareGadget('gadget_erp5_page_form.html', {scope: 'sub'})
.push(function (form_gadget) {
// Clear first to DOM, append after to reduce flickering/manip
while (element.firstChild) {
element.removeChild(element.firstChild);
}
element.appendChild(form_gadget.element);
// Add newly created subgadget to the state
new_state.subgadget_template = 'gadget_erp5_page_form.html';
return gadget.changeState(new_state);
});
}
return gadget.changeState(new_state); return gadget.changeState(new_state);
}) })
...@@ -78,7 +63,7 @@ ...@@ -78,7 +63,7 @@
return gadget.getDeclaredGadget('sub') return gadget.getDeclaredGadget('sub')
.push(function (subgadget) { .push(function (subgadget) {
subgadget.render(form_options); return subgadget.render(form_options);
}); });
}) })
...@@ -90,7 +75,7 @@ ...@@ -90,7 +75,7 @@
}); });
} }
return {}; return {};
}) }, {mutex: 'changestate'})
.declareMethod('checkValidity', function () { .declareMethod('checkValidity', function () {
if (this.state.editable) { if (this.state.editable) {
...@@ -100,6 +85,6 @@ ...@@ -100,6 +85,6 @@
}); });
} }
return true; return true;
}); }, {mutex: 'changestate'});
}(window, rJS, URI)); }(window, rJS, URI));
\ No newline at end of file
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_field_formbox_js.xml
View file @ fa704347
...@@ -216,7 +216,7 @@ ...@@ -216,7 +216,7 @@
</item> </item>
<item> <item>
<key> <string>actor</string> </key> <key> <string>actor</string> </key>
<value> <string>zope</string> </value> <value> <string>superkato</string> </value>
</item> </item>
<item> <item>
<key> <string>comment</string> </key> <key> <string>comment</string> </key>
...@@ -230,7 +230,7 @@ ...@@ -230,7 +230,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>966.24080.24291.61081</string> </value> <value> <string>967.35221.49309.22852</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -248,7 +248,7 @@ ...@@ -248,7 +248,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1521818911.25</float> <float>1526316882.68</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7