Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Klaus Wölfel
erp5
Commits
d173a863
Commit
d173a863
authored
10 years ago
by
Romain Courteaud
Committed by
Sebastien Robin
10 years ago
Browse files
Options
Download
Email Patches
Plain Diff
Do not hardcode actions used to display document
parent
bc12cb2f
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
20 additions
and
14 deletions
+20
-14
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_js.xml
...i/PathTemplateItem/web_page_module/rjs_gadget_erp5_js.xml
+4
-3
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_view_js.xml
...eItem/web_page_module/rjs_gadget_erp5_pt_form_view_js.xml
+6
-5
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_tab_list_js.xml
...plateItem/web_page_module/rjs_gadget_erp5_tab_list_js.xml
+9
-5
bt5/erp5_web_renderjs_ui/bt/revision
bt5/erp5_web_renderjs_ui/bt/revision
+1
-1
No files found.
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_js.xml
View file @
d173a863
...
...
@@ -198,6 +198,7 @@
sub_options.erp5_document = result[0].data;\n
sub_options.form_definition = result[1].data;\n
sub_options.view = options.view;\n
sub_options.action_view = gadget.props.action_view;\n
\n
return gadget.declareGadget("gadget_erp5_pt_" + sub_options.form_definition.pt + ".html", {\n
scope: "form_gadget"\n
...
...
@@ -361,7 +362,7 @@
} else {\n
if (options.view === undefined) {\n
// Redirect to the default view\n
return gadget.aq_pleasePublishMyState({jio_key: options.jio_key, view:
"view"
})\n
return gadget.aq_pleasePublishMyState({jio_key: options.jio_key, view:
gadget.props.default_view_reference
})\n
.push(gadget.pleaseRedirectMyHash.bind(gadget));\n
}\n
queue = renderJioDocument(gadget, options);\n
...
...
@@ -541,7 +542,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
936.4
7421.11609.45107
</string>
</value>
<value>
<string>
936.4
8944.48108.750
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -559,7 +560,7 @@
</tuple>
<state>
<tuple>
<float>
1407
398340.29
</float>
<float>
1407
492633.6
</float>
<string>
GMT
</string>
</tuple>
</state>
...
...
This diff is collapsed.
Click to expand it.
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_view_js.xml
View file @
d173a863
...
...
@@ -188,6 +188,7 @@
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
for (i = 0; i < all_result.length; i += 1) {\n
switch (i) {\n
...
...
@@ -212,8 +213,8 @@
\n
\n
return RSVP.all([\n
all_gadget[1].render(
form
_options),\n
all_gadget[0].render(
tab
_options),\n
all_gadget[1].render(
tab
_options),\n
all_gadget[0].render(
form
_options),\n
]);\n
});\n
\n
...
...
@@ -366,7 +367,7 @@
</item>
<item>
<key>
<string>
actor
</string>
</key>
<value>
<string>
sve
n
</string>
</value>
<value>
<string>
romai
n
</string>
</value>
</item>
<item>
<key>
<string>
comment
</string>
</key>
...
...
@@ -380,7 +381,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
936.4
3413.1047.52957
</string>
</value>
<value>
<string>
936.4
8947.19194.26931
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -398,7 +399,7 @@
</tuple>
<state>
<tuple>
<float>
1407
157797.48
</float>
<float>
1407
492656.27
</float>
<string>
GMT
</string>
</tuple>
</state>
...
...
This diff is collapsed.
Click to expand it.
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_tab_list_js.xml
View file @
d173a863
...
...
@@ -149,10 +149,14 @@
.declareMethod(\'render\', function (options) {\n
var nav_element = this.props.element.querySelector(".grid-container"),\n
erp5_document = options.erp5_document,\n
view_list = erp5_document._links.action_
object_
view,\n
view_list = erp5_document._links
[options
.action_view
]
,\n
i,\n
nav_html = \'<nav data-role="navbar">
<ul
class=
"grid-items"
>
\',\n
promise_list = []\n
promise_list = [];\n
\n
if (view_list.constructor !== Array) {\n
view_list = [view_list];\n
}\n
\n
for (i = 0; i
< view_list.length
;
i
+=
1)
{\n
\n
...
...
@@ -309,7 +313,7 @@
</item>
<item>
<key>
<string>
actor
</string>
</key>
<value>
<string>
sve
n
</string>
</value>
<value>
<string>
romai
n
</string>
</value>
</item>
<item>
<key>
<string>
comment
</string>
</key>
...
...
@@ -323,7 +327,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
936.4
6363.37694.56064
</string>
</value>
<value>
<string>
936.4
8950.45876.44202
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -341,7 +345,7 @@
</tuple>
<state>
<tuple>
<float>
1407
334850.3
</float>
<float>
1407
492676.55
</float>
<string>
GMT
</string>
</tuple>
</state>
...
...
This diff is collapsed.
Click to expand it.
bt5/erp5_web_renderjs_ui/bt/revision
View file @
d173a863
46
\ No newline at end of file
47
\ No newline at end of file
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment