Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
17
Merge Requests
17
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
slapos.core
Commits
71182a2a
Commit
71182a2a
authored
Jun 23, 2016
by
Alain Takoudjou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
monitoring: fix hosting subscription list when monitor instance data are not synchronized
parent
16ecf71d
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
8 deletions
+21
-8
master/bt5/slapos_monitoring/PathTemplateItem/web_page_module/gadget_monitoring_appcache.xml
...mplateItem/web_page_module/gadget_monitoring_appcache.xml
+6
-3
master/bt5/slapos_monitoring/PathTemplateItem/web_page_module/gadget_monitoring_hosting_subscription_list_js.html
...odule/gadget_monitoring_hosting_subscription_list_js.html
+15
-5
No files found.
master/bt5/slapos_monitoring/PathTemplateItem/web_page_module/gadget_monitoring_appcache.xml
View file @
71182a2a
...
@@ -107,7 +107,7 @@
...
@@ -107,7 +107,7 @@
<value>
<string
encoding=
"cdata"
>
<![CDATA[
<value>
<string
encoding=
"cdata"
>
<![CDATA[
CACHE MANIFEST\n
CACHE MANIFEST\n
# generated on Fri, 2
5 Mai
2016 15:47:33 +0000\n
# generated on Fri, 2
3 June
2016 15:47:33 +0000\n
# XXX + fonts\n
# XXX + fonts\n
# images/ajax-loader.gif\n
# images/ajax-loader.gif\n
CACHE:\n
CACHE:\n
...
@@ -122,11 +122,14 @@ Chart.min.js\n
...
@@ -122,11 +122,14 @@ Chart.min.js\n
dygraph.js\n
dygraph.js\n
gadget_erp5.css\n
gadget_erp5.css\n
gadget_global.js\n
gadget_global.js\n
gadget_erp5_graph.html\n
gadget_erp5_graph.js\n
gadget_jio.html\n
gadget_jio.html\n
gadget_jio.js\n
gadget_jio.js\n
gadget_translate.html\n
gadget_translate.html\n
gadget_translate.js\n
gadget_translate.js\n
gadget_translation.html\n
gadget_translation.html\n
dygraph.js\n
handlebars.js\n
handlebars.js\n
i18next.js\n
i18next.js\n
jiodev.js\n
jiodev.js\n
...
@@ -334,7 +337,7 @@ NETWORK:\n
...
@@ -334,7 +337,7 @@ NETWORK:\n
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
95
1.30729.47924.44561
</string>
</value>
<value>
<string>
95
2.4357.25082.29508
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -352,7 +355,7 @@ NETWORK:\n
...
@@ -352,7 +355,7 @@ NETWORK:\n
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
146
4342540.22
</float>
<float>
146
6692187.09
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
master/bt5/slapos_monitoring/PathTemplateItem/web_page_module/gadget_monitoring_hosting_subscription_list_js.html
View file @
71182a2a
...
@@ -168,11 +168,21 @@
...
@@ -168,11 +168,21 @@
hosting_title =
document_list[i][j]['hosting-title']
||
'';
hosting_title =
document_list[i][j]['hosting-title']
||
'';
}
}
}
}
if
(hosting_dict.instance_list.length =
==
0
)
{
//
No
instance
data
was
found
!
hosting_dict.status =
'ERROR'
;
hosting_dict.title =
gadget.props.opml_dict[
gadget
.
props
.
opml_key_list
[
i
]].
title
;
hosting_dict.date =
'Not available'
;
//
Redirect
to
configurator
to
sync
data
hosting_dict.href =
'#page=settings_configurator&tab=manage'
;
}
else
{
hosting_dict.status =
status;
hosting_dict.status =
status;
hosting_dict.title =
hosting_title;
hosting_dict.title =
hosting_title;
hosting_dict.date =
date;
hosting_dict.date =
date;
hosting_dict.href =
"#page=hosting_subscription_view&key="
+
hosting_dict.href =
"#page=hosting_subscription_view&key="
+
gadget
.
props
.
opml_key_list
[
i
];
gadget
.
props
.
opml_key_list
[
i
];
}
gadget
.
props
.
hosting_list
.
push
(
hosting_dict
);
gadget
.
props
.
hosting_list
.
push
(
hosting_dict
);
}
}
content =
hosting_widget_template({
content =
hosting_widget_template({
...
...
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