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
dbd0b691
Commit
dbd0b691
authored
Oct 11, 2024
by
Roque
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_web_monitoring: force_re_config
parent
a313b6c5
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_jio_js.js
...Item/web_page_module/gadget_officejs_monitoring_jio_js.js
+4
-4
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 @
dbd0b691
...
...
@@ -120,7 +120,7 @@
.
declareAcquiredMethod
(
"
setSettingList
"
,
"
setSettingList
"
)
.
declareAcquiredMethod
(
"
setSetting
"
,
"
setSetting
"
)
.
declareMethod
(
'
updateConfiguration
'
,
function
(
appcache_storage
,
current_version
,
jio_storage
,
force_config
)
{
.
declareMethod
(
'
updateConfiguration
'
,
function
(
appcache_storage
,
current_version
,
jio_storage
,
force_
re_
config
)
{
var
gadget
=
this
,
setting_dict
=
{
'
migration_version
'
:
current_version
};
if
(
!
appcache_storage
)
{
return
;
}
return
RSVP
.
Queue
()
...
...
@@ -131,7 +131,7 @@
return
jio_storage
.
repair
();
})
.
push
(
function
()
{
if
(
force_config
)
{
if
(
force_
re_
config
)
{
setting_dict
.
master_url_list
=
undefined
;
setting_dict
.
master_url_list_updated
=
false
;
}
...
...
@@ -240,8 +240,8 @@
if
(
migration_version
!==
current_version
)
{
appcache_storage
=
jIO
.
createJIO
(
appcache_jio
);
//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
);
var
force_
re_
config
=
true
;
return
gadget
.
updateConfiguration
(
appcache_storage
,
current_version
,
gadget
.
props
.
jio_storage
,
force_
re_
config
);
}
})
.
push
(
function
()
{
...
...
bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_jio_js.xml
View file @
dbd0b691
...
...
@@ -249,7 +249,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
1019.603
08.13005.327
6
</string>
</value>
<value>
<string>
1019.603
11.3311.3213
6
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -269,7 +269,7 @@
</tuple>
<state>
<tuple>
<float>
172866
5702.9
6
</float>
<float>
172866
6213.
6
</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