Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Aurélien Vermylen
erp5
Commits
e5555cac
Commit
e5555cac
authored
9 years ago
by
Sven Franck
Committed by
Xiaowu Zhang
9 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_web_renderjs_ui: fix form gadget doing unneeded translation and breaking child declareServices
parent
eedd20e5
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
10 deletions
+3
-10
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_form_js.xml
...hTemplateItem/web_page_module/rjs_gadget_erp5_form_js.xml
+3
-10
No files found.
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_form_js.xml
View file @
e5555cac
...
...
@@ -130,7 +130,6 @@
})\n
\n
.declareAcquiredMethod("aq_put", "jio_put")\n
.declareAcquiredMethod("translateHtml", "translateHtml")\n
\n
.allowPublicAcquisition("notifyInvalid", function (param_list, scope) {\n
return this.getDeclaredGadget(scope)\n
...
...
@@ -271,19 +270,13 @@
\n
return
queue\n
.push(function
()
{\n
var
temp =
document.createElement("div");\n
temp.appendChild(parent_element);\n
return
form_gadget.translateHtml(temp.innerHTML);\n
})\n
.push(function
(my_translated_html)
{\n
var
dom_element =
form_gadget.props.element\n
.querySelector(".field_container");\n
while
(dom_element.firstChild)
{\n
dom_element.removeChild(dom_element.firstChild);\n
}\n
dom_element.
innerHTML =
my_translated_html
;\n
dom_element.
appendChild(parent_element)
;\n
//
return
$(parent_element).trigger("create");\n
\n
});\n
})\n
\n
...
...
@@ -486,7 +479,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
9
39.62597.55939.38724
</string>
</value>
<value>
<string>
9
40.2226.16128.23057
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -504,7 +497,7 @@
</tuple>
<state>
<tuple>
<float>
14
19932704.1
6
</float>
<float>
14
20242897.
6
</float>
<string>
GMT
</string>
</tuple>
</state>
...
...
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