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
Labels
Merge Requests
144
Merge Requests
144
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
Jobs
Commits
Open sidebar
nexedi
erp5
Commits
9db5d0e4
Commit
9db5d0e4
authored
Nov 29, 2019
by
Roque
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_web_renderjs_ui: refactor setSetting and setSettingList
parent
5bfdb8c4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
45 additions
and
48 deletions
+45
-48
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_launcher_js.js
...mplateItem/web_page_module/rjs_gadget_erp5_launcher_js.js
+43
-46
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_launcher_js.xml
...plateItem/web_page_module/rjs_gadget_erp5_launcher_js.xml
+2
-2
No files found.
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_launcher_js.js
View file @
9db5d0e4
...
...
@@ -274,6 +274,26 @@
});
}
function
handleSetSetting
(
gadget
,
argument_list
,
putSettingFunction
)
{
var
jio_gadget
,
doc
;
return
gadget
.
getDeclaredGadget
(
"
setting_gadget
"
)
.
push
(
function
(
result
)
{
jio_gadget
=
result
;
return
jio_gadget
.
get
(
gadget
.
state
.
setting_id
);
})
.
push
(
function
(
result
)
{
doc
=
result
;
},
function
(
error
)
{
if
(
error
.
status_code
===
404
)
{
doc
=
{};
}
throw
error
;
})
.
push
(
function
()
{
return
putSettingFunction
(
gadget
,
jio_gadget
,
doc
,
argument_list
);
});
}
rJS
(
window
)
// Add mutex protected defered gadget loader.
...
...
@@ -423,57 +443,34 @@
});
})
.
allowPublicAcquisition
(
"
setSetting
"
,
function
setSetting
(
argument_list
)
{
var
jio_gadget
,
gadget
=
this
,
key
=
argument_list
[
0
],
value
=
argument_list
[
1
];
return
gadget
.
getDeclaredGadget
(
"
setting_gadget
"
)
.
push
(
function
(
result
)
{
jio_gadget
=
result
;
return
jio_gadget
.
get
(
gadget
.
state
.
setting_id
);
})
.
push
(
undefined
,
function
(
error
)
{
if
(
error
.
status_code
===
404
)
{
return
{};
}
throw
error
;
})
.
push
(
function
(
doc
)
{
doc
[
key
]
=
value
;
return
jio_gadget
.
put
(
gadget
.
state
.
setting_id
,
doc
);
});
var
gadget
=
this
;
function
putSingleSetting
(
gadget
,
jio_gadget
,
doc
,
argument_list
)
{
var
key
=
argument_list
[
0
],
value
=
argument_list
[
1
];
doc
[
key
]
=
value
;
return
jio_gadget
.
put
(
gadget
.
state
.
setting_id
,
doc
);
}
return
handleSetSetting
(
gadget
,
argument_list
,
putSingleSetting
);
})
.
allowPublicAcquisition
(
"
setSettingList
"
,
function
setSettingList
(
argument_list
)
{
var
jio_gadget
,
gadget
=
this
,
update_setting
,
setting_dict
=
argument_list
[
0
];
return
gadget
.
getDeclaredGadget
(
"
setting_gadget
"
)
.
push
(
function
(
result
)
{
jio_gadget
=
result
;
return
jio_gadget
.
get
(
gadget
.
state
.
setting_id
);
})
.
push
(
undefined
,
function
(
error
)
{
if
(
error
.
status_code
===
404
)
{
return
{};
}
throw
error
;
})
.
push
(
function
(
doc
)
{
for
(
var
key
in
setting_dict
)
{
if
(
setting_dict
.
hasOwnProperty
(
key
))
{
if
(
!
doc
.
hasOwnProperty
(
key
)
||
doc
[
key
]
!==
setting_dict
[
key
])
{
doc
[
key
]
=
setting_dict
[
key
];
update_setting
=
true
;
}
var
gadget
=
this
;
function
putMultipleSetting
(
gadget
,
jio_gadget
,
doc
,
argument_list
)
{
var
setting_dict
=
argument_list
[
0
],
update_setting
;
for
(
var
key
in
setting_dict
)
{
if
(
setting_dict
.
hasOwnProperty
(
key
))
{
if
(
!
doc
.
hasOwnProperty
(
key
)
||
doc
[
key
]
!==
setting_dict
[
key
])
{
doc
[
key
]
=
setting_dict
[
key
];
update_setting
=
true
;
}
}
if
(
update_setting
)
{
jio_gadget
.
put
(
gadget
.
state
.
setting_id
,
doc
);
}
});
}
if
(
update_setting
)
{
jio_gadget
.
put
(
gadget
.
state
.
setting_id
,
doc
);
}
}
return
handleSetSetting
(
gadget
,
argument_list
,
putMultipleSetting
);
})
.
allowPublicAcquisition
(
"
translateHtml
"
,
function
translateHtml
(
argument_list
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_launcher_js.xml
View file @
9db5d0e4
...
...
@@ -228,7 +228,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
980.
6822.42387.2969
</string>
</value>
<value>
<string>
980.
7973.50307.2286
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -246,7 +246,7 @@
</tuple>
<state>
<tuple>
<float>
157
4953398.71
</float>
<float>
157
5023309.48
</float>
<string>
UTC
</string>
</tuple>
</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