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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Laurent S
erp5
Commits
721fcfee
Commit
721fcfee
authored
Sep 20, 2017
by
Tomáš Peterka
Committed by
Tomáš Peterka
Sep 22, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[renderjs_ui] MatrixBox uses "default" instead of "value" for sub-gadgets
parent
10f9b012
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_field_matrixbox_js.js
...tem/web_page_module/rjs_gadget_erp5_field_matrixbox_js.js
+1
-1
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_field_matrixbox_js.xml
...em/web_page_module/rjs_gadget_erp5_field_matrixbox_js.xml
+3
-3
No files found.
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_field_matrixbox_js.js
View file @
721fcfee
...
@@ -208,7 +208,7 @@
...
@@ -208,7 +208,7 @@
// we copy (unknown) structure of template_field and carefully
// we copy (unknown) structure of template_field and carefully
// add known attributes from `column`
// add known attributes from `column`
field_json
.
value
=
column
.
value
;
field_json
.
default
=
column
.
value
;
field_json
.
key
=
"
field_
"
+
column
.
key
;
field_json
.
key
=
"
field_
"
+
column
.
key
;
field_json
.
hidden
=
gadget
.
state
.
hidden
||
template_field
.
hidden
;
// any hidden will hide the element
field_json
.
hidden
=
gadget
.
state
.
hidden
||
template_field
.
hidden
;
// any hidden will hide the element
field_json
.
editable
=
gadget
.
state
.
editable
&&
template_field
.
editable
;
// any non-editable will disable editation
field_json
.
editable
=
gadget
.
state
.
editable
&&
template_field
.
editable
;
// any non-editable will disable editation
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_field_matrixbox_js.xml
View file @
721fcfee
...
@@ -105,7 +105,7 @@
...
@@ -105,7 +105,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
title
</string>
</key>
<key>
<string>
title
</string>
</key>
<value>
<string>
Gadget ERP5 Matrixbox Field
HTML
</string>
</value>
<value>
<string>
Gadget ERP5 Matrixbox Field
JS
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
version
</string>
</key>
<key>
<string>
version
</string>
</key>
...
@@ -236,7 +236,7 @@
...
@@ -236,7 +236,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
96
1.46727.895.5218
9
</string>
</value>
<value>
<string>
96
2.13951.51856.3822
9
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -254,7 +254,7 @@
...
@@ -254,7 +254,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
150
4008626.15
</float>
<float>
150
5898245.04
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
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