Skip to content

erp5
erp5
Commit 0842eda3 authored by Sven Franck's avatar Sven Franck Committed by Sebastien Robin
Browse files
Options

move tab gadget one level up onto erp5 gadget

parent d173a863
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 28 deletions
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_list_html.xml
View file @ 0842eda3
...@@ -254,7 +254,7 @@ ...@@ -254,7 +254,7 @@
</item> </item>
<item> <item>
<key> <string>actor</string> </key> <key> <string>actor</string> </key>
<value> <string>sven</string> </value> <value> <string>romain</string> </value>
</item> </item>
<item> <item>
<key> <string>comment</string> </key> <key> <string>comment</string> </key>
...@@ -268,7 +268,7 @@ ...@@ -268,7 +268,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>936.36329.11895.39031</string> </value> <value> <string>936.46405.53164.22289</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -286,7 +286,7 @@ ...@@ -286,7 +286,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1406812401.15</float> <float>1407339467.24</float>
<string>GMT</string> <string>GMT</string>
</tuple> </tuple>
</state> </state>
......
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_view_html.xml
View file @ 0842eda3
...@@ -129,10 +129,7 @@ ...@@ -129,10 +129,7 @@
\n \n
</head>\n </head>\n
<body>\n <body>\n
<div data-gadget-url="gadget_erp5_tab_list.html"\n \n
data-gadget-scope="erp5_tab"\n
data-gadget-sandbox="public">\n
</div>\n
<!-- XXX action, method, fieldset -->\n <!-- XXX action, method, fieldset -->\n
<form class="save_form">\n <form class="save_form">\n
<button type="submit" class="ui-btn ui-btn-b ui-btn-inline\n <button type="submit" class="ui-btn ui-btn-b ui-btn-inline\n
...@@ -286,7 +283,7 @@ ...@@ -286,7 +283,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>936.43414.60024.22664</string> </value> <value> <string>936.54726.55391.8362</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -304,7 +301,7 @@ ...@@ -304,7 +301,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1407158686.32</float> <float>1407836841.44</float>
<string>GMT</string> <string>GMT</string>
</tuple> </tuple>
</state> </state>
......
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_view_js.xml
View file @ 0842eda3
...@@ -169,14 +169,12 @@ ...@@ -169,14 +169,12 @@
.push(function () {\n .push(function () {\n
return RSVP.all([\n return RSVP.all([\n
form_gadget.getDeclaredGadget("erp5_form"),\n form_gadget.getDeclaredGadget("erp5_form"),\n
form_gadget.getDeclaredGadget("erp5_tab"),\n
RSVP.all(promise_list)\n RSVP.all(promise_list)\n
]);\n ]);\n
})\n })\n
.push(function (all_gadget) {\n .push(function (all_gadget) {\n
var form_options = options.erp5_form || {},\n var form_options = options.erp5_form || {},\n
tab_options = options.erp5_tag || {},\n all_result = all_gadget[1],\n
all_result = all_gadget[2],\n
actionlist = [],\n actionlist = [],\n
class_list,\n class_list,\n
i;\n i;\n
...@@ -184,11 +182,6 @@ ...@@ -184,11 +182,6 @@
form_options.erp5_document = options.erp5_document;\n form_options.erp5_document = options.erp5_document;\n
form_options.form_definition = options.form_definition;\n form_options.form_definition = options.form_definition;\n
form_options.view = options.view;\n form_options.view = options.view;\n
\n
tab_options.erp5_document = options.erp5_document;\n
tab_options.form_definition = options.form_definition;\n
tab_options.view = options.view;\n
tab_options.action_view = options.action_view;\n
\n \n
for (i = 0; i < all_result.length; i += 1) {\n for (i = 0; i < all_result.length; i += 1) {\n
switch (i) {\n switch (i) {\n
...@@ -213,7 +206,6 @@ ...@@ -213,7 +206,6 @@
\n \n
\n \n
return RSVP.all([\n return RSVP.all([\n
all_gadget[1].render(tab_options),\n
all_gadget[0].render(form_options),\n all_gadget[0].render(form_options),\n
]);\n ]);\n
});\n });\n
...@@ -367,7 +359,7 @@ ...@@ -367,7 +359,7 @@
</item> </item>
<item> <item>
<key> <string>actor</string> </key> <key> <string>actor</string> </key>
<value> <string>romain</string> </value> <value> <string>sven</string> </value>
</item> </item>
<item> <item>
<key> <string>comment</string> </key> <key> <string>comment</string> </key>
...@@ -381,7 +373,7 @@ ...@@ -381,7 +373,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>936.48947.19194.26931</string> </value> <value> <string>936.54729.48588.29371</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -399,7 +391,7 @@ ...@@ -399,7 +391,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1407492656.27</float> <float>1407836873.52</float>
<string>GMT</string> <string>GMT</string>
</tuple> </tuple>
</state> </state>
......
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_tab_list_js.xml
View file @ 0842eda3
...@@ -150,16 +150,20 @@ ...@@ -150,16 +150,20 @@
var nav_element = this.props.element.querySelector(".grid-container"),\n var nav_element = this.props.element.querySelector(".grid-container"),\n
erp5_document = options.erp5_document,\n erp5_document = options.erp5_document,\n
view_list = erp5_document._links[options.action_view],\n view_list = erp5_document._links[options.action_view],\n
i,\n
nav_html = \'<nav data-role="navbar"><ul class="grid-items">\',\n nav_html = \'<nav data-role="navbar"><ul class="grid-items">\',\n
promise_list = [];\n promise_list = [],\n
i;\n
\n
// no views\n
if (view_list === undefined) {\n
return;\n
}\n
\n \n
if (view_list.constructor !== Array) {\n if (view_list.constructor !== Array) {\n
view_list = [view_list];\n view_list = [view_list];\n
}\n }\n
\n \n
for (i = 0; i < view_list.length; i += 1) {\n for (i = 0; i < view_list.length; i += 1) {\n
\n
promise_list.push(this.whoWantToDisplayThisPage({\n promise_list.push(this.whoWantToDisplayThisPage({\n
name: view_list[i].name\n name: view_list[i].name\n
})); \n })); \n
...@@ -313,7 +317,7 @@ ...@@ -313,7 +317,7 @@
</item> </item>
<item> <item>
<key> <string>actor</string> </key> <key> <string>actor</string> </key>
<value> <string>romain</string> </value> <value> <string>sven</string> </value>
</item> </item>
<item> <item>
<key> <string>comment</string> </key> <key> <string>comment</string> </key>
...@@ -327,7 +331,7 @@ ...@@ -327,7 +331,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>936.48950.45876.44202</string> </value> <value> <string>936.54744.40513.43571</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -345,7 +349,7 @@ ...@@ -345,7 +349,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1407492676.55</float> <float>1407838655.15</float>
<string>GMT</string> <string>GMT</string>
</tuple> </tuple>
</state> </state>
......
bt5/erp5_web_renderjs_ui/bt/revision
View file @ 0842eda3
47 48
\ No newline at end of file \ No newline at end of file
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