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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Nicolas Wavrant
erp5
Commits
4a67b651
Commit
4a67b651
authored
Oct 30, 2018
by
Alain Takoudjou
Committed by
Rafael Monnerat
Sep 21, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[erp5_web_monitoring] do not loop on asking to import setting from slapos master
parent
1b71ec24
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
6 deletions
+16
-6
bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_synchronize_js.js
...m/web_page_module/gadget_erp5_page_ojsm_synchronize_js.js
+11
-1
bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_synchronize_js.xml
.../web_page_module/gadget_erp5_page_ojsm_synchronize_js.xml
+2
-2
bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_panel_js.js
...em/web_page_module/gadget_officejs_monitoring_panel_js.js
+1
-1
bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_panel_js.xml
...m/web_page_module/gadget_officejs_monitoring_panel_js.xml
+2
-2
No files found.
bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_synchronize_js.js
View file @
4a67b651
...
...
@@ -12,7 +12,7 @@
.
declareAcquiredMethod
(
"
getSetting
"
,
"
getSetting
"
)
.
declareAcquiredMethod
(
"
setSetting
"
,
"
setSetting
"
)
.
declareMethod
(
"
render
"
,
function
()
{
.
declareMethod
(
"
render
"
,
function
(
options
)
{
var
gadget
=
this
;
return
this
.
updateHeader
({
page_title
:
"
Monitoring Synchronization
"
...
...
@@ -26,6 +26,16 @@
})
.
push
(
function
()
{
var
redirect_options
=
{
"
page
"
:
"
ojsm_status_list
"
};
if
(
options
.
reset
===
"
1
"
)
{
// reset redirections
return
gadget
.
setSetting
(
"
sync_redirect_options
"
,
undefined
)
.
push
(
function
()
{
return
gadget
.
redirect
({
"
command
"
:
"
display
"
,
"
options
"
:
redirect_options
});
});
}
return
gadget
.
getSetting
(
'
sync_redirect_options
'
)
.
push
(
function
(
redirect_dict
)
{
if
(
redirect_options
)
{
...
...
bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_synchronize_js.xml
View file @
4a67b651
...
...
@@ -250,7 +250,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
9
63.37808.2626.47837
</string>
</value>
<value>
<string>
9
71.18960.44200.52138
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -268,7 +268,7 @@
</tuple>
<state>
<tuple>
<float>
15
11175451.34
</float>
<float>
15
40897197.53
</float>
<string>
UTC
</string>
</tuple>
</state>
...
...
bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_panel_js.js
View file @
4a67b651
...
...
@@ -144,7 +144,7 @@
context
.
getUrlFor
({
command
:
'
display
'
,
options
:
{
page
:
"
ojsm_hosting_subscription_list
"
}}),
context
.
getUrlFor
({
command
:
'
display
'
,
options
:
{
page
:
"
settings_configurator
"
}}),
context
.
getUrlFor
({
command
:
'
display
'
,
options
:
{
page
:
"
ojsm_import_export
"
}}),
context
.
getUrlFor
({
command
:
'
display
'
,
options
:
{
page
:
"
ojsm_synchronize
"
}})
context
.
getUrlFor
({
command
:
'
display
'
,
options
:
{
page
:
"
ojsm_synchronize
"
,
reset
:
1
}})
]);
})
.
push
(
function
(
result_list
)
{
...
...
bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_panel_js.xml
View file @
4a67b651
...
...
@@ -242,7 +242,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
963.3347
3.65379.28757
</string>
</value>
<value>
<string>
963.3347
4.25813.19302
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -260,7 +260,7 @@
</tuple>
<state>
<tuple>
<float>
15
10915343.58
</float>
<float>
15
40896767.32
</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