Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5-Boxiang
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
Hamza
erp5-Boxiang
Commits
87d0fe78
Commit
87d0fe78
authored
Sep 17, 2018
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[erp5_web_renderjs_ui] RadioField: handle required parameter
parent
9b5a4fac
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
7 deletions
+16
-7
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_radiofield_js.js
...lateItem/web_page_module/rjs_gadget_erp5_radiofield_js.js
+14
-5
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_radiofield_js.xml
...ateItem/web_page_module/rjs_gadget_erp5_radiofield_js.xml
+2
-2
No files found.
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_radiofield_js.js
View file @
87d0fe78
...
@@ -6,10 +6,7 @@
...
@@ -6,10 +6,7 @@
function
appendCheckboxField
(
gadget
,
item
)
{
function
appendCheckboxField
(
gadget
,
item
)
{
var
input_gadget
,
var
input_gadget
,
label_gadget
;
label_gadget
;
return
new
RSVP
.
Queue
()
return
gadget
.
declareGadget
(
'
gadget_html5_input.html
'
,
{
scope
:
item
[
1
]})
.
push
(
function
()
{
return
gadget
.
declareGadget
(
'
gadget_html5_input.html
'
,
{
scope
:
item
[
1
]});
})
.
push
(
function
(
result
)
{
.
push
(
function
(
result
)
{
input_gadget
=
result
;
input_gadget
=
result
;
var
state_dict
=
{
var
state_dict
=
{
...
@@ -51,6 +48,7 @@
...
@@ -51,6 +48,7 @@
state_dict
=
{
state_dict
=
{
value
:
field_json
.
value
||
field_json
.
default
,
value
:
field_json
.
value
||
field_json
.
default
,
select_first_item
:
field_json
.
select_first_item
,
select_first_item
:
field_json
.
select_first_item
,
required
:
field_json
.
required
,
editable
:
field_json
.
editable
,
editable
:
field_json
.
editable
,
name
:
field_json
.
key
,
name
:
field_json
.
key
,
title
:
field_json
.
title
,
title
:
field_json
.
title
,
...
@@ -163,5 +161,16 @@
...
@@ -163,5 +161,16 @@
});
});
}
}
return
final_result
;
return
final_result
;
},
{
mutex
:
'
changestate
'
});
},
{
mutex
:
'
changestate
'
})
.
declareMethod
(
'
checkValidity
'
,
function
()
{
var
name
=
this
.
state
.
name
;
if
(
this
.
state
.
editable
&&
this
.
state
.
required
)
{
return
this
.
getContent
()
.
push
(
function
(
result
)
{
return
!
result
[
name
];
});
}
return
true
;
});
}(
window
,
rJS
,
RSVP
));
}(
window
,
rJS
,
RSVP
));
\ No newline at end of file
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_radiofield_js.xml
View file @
87d0fe78
...
@@ -230,7 +230,7 @@
...
@@ -230,7 +230,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
9
65.241.13759.3805
</string>
</value>
<value>
<string>
9
70.6901.45351.47854
</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>
15
17321388.02
</float>
<float>
15
36327985.34
</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