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
1
Issues
1
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
Roque
erp5
Commits
a313b6c5
Commit
a313b6c5
authored
Oct 11, 2024
by
Roque
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[WIP] erp5_web_monitoring: force re-config mec
parent
27a6dce4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
8 deletions
+12
-8
bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_jio_js.js
...Item/web_page_module/gadget_officejs_monitoring_jio_js.js
+10
-6
bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_jio_js.xml
...tem/web_page_module/gadget_officejs_monitoring_jio_js.xml
+2
-2
No files found.
bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_jio_js.js
View file @
a313b6c5
...
...
@@ -120,8 +120,8 @@
.
declareAcquiredMethod
(
"
setSettingList
"
,
"
setSettingList
"
)
.
declareAcquiredMethod
(
"
setSetting
"
,
"
setSetting
"
)
.
declareMethod
(
'
updateConfiguration
'
,
function
(
appcache_storage
,
current_version
,
jio_storage
)
{
var
gadget
=
this
;
.
declareMethod
(
'
updateConfiguration
'
,
function
(
appcache_storage
,
current_version
,
jio_storage
,
force_config
)
{
var
gadget
=
this
,
setting_dict
=
{
'
migration_version
'
:
current_version
}
;
if
(
!
appcache_storage
)
{
return
;
}
return
RSVP
.
Queue
()
.
push
(
function
()
{
...
...
@@ -131,9 +131,11 @@
return
jio_storage
.
repair
();
})
.
push
(
function
()
{
return
gadget
.
setSettingList
({
'
migration_version
'
:
current_version
,
'
master_url_list
'
:
undefined
,
'
master_url_list_updated
'
:
false
});
if
(
force_config
)
{
setting_dict
.
master_url_list
=
undefined
;
setting_dict
.
master_url_list_updated
=
false
;
}
return
gadget
.
setSettingList
(
setting_dict
);
});
})
...
...
@@ -237,7 +239,9 @@
.
push
(
function
()
{
if
(
migration_version
!==
current_version
)
{
appcache_storage
=
jIO
.
createJIO
(
appcache_jio
);
return
gadget
.
updateConfiguration
(
appcache_storage
,
current_version
,
gadget
.
props
.
jio_storage
);
//TODO make it true only if old config is present (e.g. 'promise' portal_type objects (instead of new 'Promise')
var
force_config
=
true
;
return
gadget
.
updateConfiguration
(
appcache_storage
,
current_version
,
gadget
.
props
.
jio_storage
,
force_config
);
}
})
.
push
(
function
()
{
...
...
bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_jio_js.xml
View file @
a313b6c5
...
...
@@ -249,7 +249,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
1019.
25813.42370.5614
</string>
</value>
<value>
<string>
1019.
60308.13005.3276
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -269,7 +269,7 @@
</tuple>
<state>
<tuple>
<float>
172
6682335.1
</float>
<float>
172
8665702.96
</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