diff --git a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_map_js.js b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_map_js.js
index 92e3028b86625ac2a426bef69bc4edf8ae09c6e3..e1ff1131fc506327727cdf0603cc03dbd8cb3b2f 100644
--- a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_map_js.js
+++ b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_map_js.js
@@ -223,7 +223,8 @@
new_marker_list[index].openPopup();
return computer.render({value: {
jio_key : gadget.options.marker_list ? gadget.options.marker_list[index].jio_key : "",
- doc: gadget.options.marker_list ? gadget.options.marker_list[index].doc : ""
+ doc: gadget.options.marker_list ? gadget.options.marker_list[index].doc : "",
+ result: gadget.options.marker_list ? gadget.options.marker_list[index].doc.result : ""
}
});
});
diff --git a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_map_js.xml b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_map_js.xml
index a8bfa8e9ee57246ab2cc8d507d12a06efc6a841d..7ad18600fb40f07ec5c251ce4e27afcd9b224a0b 100644
--- a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_map_js.xml
+++ b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_map_js.xml
@@ -216,7 +216,7 @@
</item>
<item>
<key> <string>actor</string> </key>
- <value> <string>zope</string> </value>
+ <value> <string>superrafael</string> </value>
</item>
<item>
<key> <string>comment</string> </key>
@@ -230,7 +230,7 @@
</item>
<item>
<key> <string>serial</string> </key>
- <value> <string>964.17374.26177.2048</string> </value>
+ <value> <string>974.51816.55280.41267</string> </value>
</item>
<item>
<key> <string>state</string> </key>
@@ -248,7 +248,7 @@
</tuple>
<state>
<tuple>
- <float>1513795256.89</float>
+ <float>1554319312.07</float>
<string>UTC</string>
</tuple>
</state>
diff --git a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_computer_network_view_js.xml b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_computer_network_view_js.xml
index db4611c754cfd359fd95c4ae73d483be7a607cab..181921c4773507c96cb1c5504e3e2445f33e7e96 100644
--- a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_computer_network_view_js.xml
+++ b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_computer_network_view_js.xml
@@ -216,7 +216,7 @@
</item>
<item>
<key> <string>actor</string> </key>
- <value> <string>zope</string> </value>
+ <value> <string>superrafael</string> </value>
</item>
<item>
<key> <string>comment</string> </key>
@@ -230,7 +230,7 @@
</item>
<item>
<key> <string>serial</string> </key>
- <value> <string>974.29154.30429.60091</string> </value>
+ <value> <string>974.29228.49487.5973</string> </value>
</item>
<item>
<key> <string>state</string> </key>
@@ -248,7 +248,7 @@
</tuple>
<state>
<tuple>
- <float>1554310335.73</float>
+ <float>1554308925.29</float>
<string>UTC</string>
</tuple>
</state>
diff --git a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_computer_view_js.xml b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_computer_view_js.xml
index 2c50351de5f8d933a7467cd50e82e4568daa1388..fed82353f66467d23425426e343fc652c0479bd3 100644
--- a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_computer_view_js.xml
+++ b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_computer_view_js.xml
@@ -257,7 +257,7 @@
</item>
<item>
<key> <string>serial</string> </key>
- <value> <string>974.50679.18778.20650</string> </value>
+ <value> <string>972.38762.9625.45482</string> </value>
</item>
<item>
<key> <string>state</string> </key>
@@ -275,7 +275,7 @@
</tuple>
<state>
<tuple>
- <float>1554258070.92</float>
+ <float>1545932477.94</float>
<string>UTC</string>
</tuple>
</state>
diff --git a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_hosting_subscription_view_js.xml b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_hosting_subscription_view_js.xml
index b413d98689533ae2d3272e87bd04c8c8b67a7022..5f27bbcd198a083ac56555d3006b45d273fc7154 100644
--- a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_hosting_subscription_view_js.xml
+++ b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_hosting_subscription_view_js.xml
@@ -216,7 +216,7 @@
</item>
<item>
<key> <string>actor</string> </key>
- <value> <string>zope</string> </value>
+ <value> <string>superrafael</string> </value>
</item>
<item>
<key> <string>comment</string> </key>
@@ -230,7 +230,7 @@
</item>
<item>
<key> <string>serial</string> </key>
- <value> <string>974.50466.65103.30515</string> </value>
+ <value> <string>974.50467.55565.53623</string> </value>
</item>
<item>
<key> <string>state</string> </key>
@@ -248,7 +248,7 @@
</tuple>
<state>
<tuple>
- <float>1554257716.79</float>
+ <float>1554251651.88</float>
<string>UTC</string>
</tuple>
</state>
diff --git a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_organisation_view_js.js b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_organisation_view_js.js
index 997752e1c54ed907c4427e19779b08415f9fb2a7..8248b6e965deff892b9d3a0f45506af01e422294 100644
--- a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_organisation_view_js.js
+++ b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_organisation_view_js.js
@@ -149,8 +149,9 @@
},
"my_monitoring_status": {
"description": "",
- "title": "Map",
- "default": {jio_key: gadget.state.jio_key},
+ "title": "Monitoring",
+ "default": {jio_key: gadget.state.jio_key,
+ result: gadget.state.doc.news},
"css_class": "",
"required": 1,
"editable": 0,
@@ -162,11 +163,12 @@
},
"my_organisation_map": {
"description": "",
- "title": "Monitoring Status",
+ "title": "Map",
"default": [
{"jio_key": gadget.state.jio_key,
"doc": {"title": gadget.state.doc.title,
"reference": gadget.state.doc.reference,
+ "result": gadget.state.doc.news,
"latitude": gadget.state.doc.default_geographical_location_latitude,
"longitude": gadget.state.doc.default_geographical_location_longitude}
}
diff --git a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_organisation_view_js.xml b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_organisation_view_js.xml
index eec2ae6abdc07e2b363d855f32c2fca47b593c17..75572b5ae888c05956dafc101b8ca32d57884d58 100644
--- a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_organisation_view_js.xml
+++ b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_organisation_view_js.xml
@@ -216,7 +216,7 @@
</item>
<item>
<key> <string>actor</string> </key>
- <value> <string>zope</string> </value>
+ <value> <string>superrafael</string> </value>
</item>
<item>
<key> <string>comment</string> </key>
@@ -230,7 +230,7 @@
</item>
<item>
<key> <string>serial</string> </key>
- <value> <string>974.29134.59085.11229</string> </value>
+ <value> <string>974.51812.23976.40123</string> </value>
</item>
<item>
<key> <string>state</string> </key>
@@ -248,7 +248,7 @@
</tuple>
<state>
<tuple>
- <float>1554310309.89</float>
+ <float>1554319566.54</float>
<string>UTC</string>
</tuple>
</state>
diff --git a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_project_list_js.js b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_project_list_js.js
index 0e3cef8a1688d08752203ddc94434ae2f9b189c8..a5a90f76cdbd108b50d2c171e95d6081c2ecad41 100644
--- a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_project_list_js.js
+++ b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_project_list_js.js
@@ -20,14 +20,13 @@
for (i = 0; i < len; i += 1) {
if (1 || (result.data.rows[i].value.hasOwnProperty("Project_getNewsDict"))) {
value = result.data.rows[i].id;
- news = result.data.rows[i].Project_getNewsDict;
+ news = result.data.rows[i].value.Project_getNewsDict;
result.data.rows[i].value.Project_getNewsDict = {
field_gadget_param : {
css_class: "",
description: "The Status",
hidden: 0,
- "default": {jio_key: value,
- result: news},
+ "default": {jio_key: value, result: news},
key: "status",
url: "gadget_slapos_project_status.html",
title: "Status",
diff --git a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_project_list_js.xml b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_project_list_js.xml
index bf8634b6a1098935bdc79c02ec89c4aedc1ea393..2fc4f0377fd650b52fdd765da77816a9cd1b1c7b 100644
--- a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_project_list_js.xml
+++ b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_project_list_js.xml
@@ -216,7 +216,7 @@
</item>
<item>
<key> <string>actor</string> </key>
- <value> <string>zope</string> </value>
+ <value> <string>superrafael</string> </value>
</item>
<item>
<key> <string>comment</string> </key>
@@ -230,7 +230,7 @@
</item>
<item>
<key> <string>serial</string> </key>
- <value> <string>972.38850.13428.56541</string> </value>
+ <value> <string>974.29228.49487.5973</string> </value>
</item>
<item>
<key> <string>state</string> </key>
@@ -248,7 +248,7 @@
</tuple>
<state>
<tuple>
- <float>1552958933.45</float>
+ <float>1554315644.91</float>
<string>UTC</string>
</tuple>
</state>
diff --git a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_project_view_js.js b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_project_view_js.js
index c219372cc00d0e301aadb03701f1a616292d38dd..1eb7648f1ba2936eadb21914cdd3613c07ad92d2 100644
--- a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_project_view_js.js
+++ b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_project_view_js.js
@@ -36,7 +36,7 @@
css_class: "",
description: "The Status",
hidden: 0,
- "default": {jio_key: value, result: value},
+ "default": {jio_key: value_jio_key, result: value},
key: "status",
url: "gadget_slapos_computer_status.html",
title: "Status",
@@ -137,7 +137,8 @@
"my_monitoring_status": {
"description": "",
"title": "Monitoring Status",
- "default": {jio_key: gadget.state.jio_key},
+ "default": {jio_key: gadget.state.jio_key,
+ result: gadget.state.doc.news},
"css_class": "",
"required": 1,
"editable": 0,
@@ -178,7 +179,10 @@
form_definition: {
group_list: [[
"left",
- [["my_title"], ["my_reference"], ["my_description"], ['my_monitoring_status']]
+ [["my_title"], ["my_reference"], ["my_description"]]
+ ], [
+ "right",
+ [['my_monitoring_status']]
], [
"bottom",
[["listbox"]]
diff --git a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_project_view_js.xml b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_project_view_js.xml
index 42e97df6885a24d4a0f04a302e09ce7047d86888..d2c32ff3315ff3f1152b5af2c6516ea5b93b18b7 100644
--- a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_project_view_js.xml
+++ b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_project_view_js.xml
@@ -227,7 +227,7 @@
</item>
<item>
<key> <string>actor</string> </key>
- <value> <string>zope</string> </value>
+ <value> <string>superrafael</string> </value>
</item>
<item>
<key> <string>comment</string> </key>
@@ -241,7 +241,7 @@
</item>
<item>
<key> <string>serial</string> </key>
- <value> <string>974.29152.50153.14045</string> </value>
+ <value> <string>974.51731.9751.49032</string> </value>
</item>
<item>
<key> <string>state</string> </key>
@@ -259,7 +259,7 @@
</tuple>
<state>
<tuple>
- <float>1554310275.02</float>
+ <float>1554315625.43</float>
<string>UTC</string>
</tuple>
</state>
diff --git a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_service_list_js.xml b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_service_list_js.xml
index e464563fa1a64cf2c6e844aa1728a2dcfe9309b0..189f39dde817e67279206ae4eff0141cf51ec3db 100644
--- a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_service_list_js.xml
+++ b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_service_list_js.xml
@@ -216,7 +216,7 @@
</item>
<item>
<key> <string>actor</string> </key>
- <value> <string>zope</string> </value>
+ <value> <string>superrafael</string> </value>
</item>
<item>
<key> <string>comment</string> </key>
@@ -230,7 +230,7 @@
</item>
<item>
<key> <string>serial</string> </key>
- <value> <string>974.29121.45777.11366</string> </value>
+ <value> <string>974.50694.51828.32204</string> </value>
</item>
<item>
<key> <string>state</string> </key>
@@ -248,7 +248,7 @@
</tuple>
<state>
<tuple>
- <float>1554257753.72</float>
+ <float>1554254296.08</float>
<string>UTC</string>
</tuple>
</state>
diff --git a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_site_list_js.js b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_site_list_js.js
index 68ea99394edcbff22f4de125ef37b040da42b65f..21e1cae0ef24b0e3b4c8cb1313880830f5393509 100644
--- a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_site_list_js.js
+++ b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_site_list_js.js
@@ -16,16 +16,17 @@
var gadget = this;
return gadget.jio_allDocs(param_list[0])
.push(function (result) {
- var i, value, len = result.data.total_rows;
+ var i, value, value_jio_key, len = result.data.total_rows;
for (i = 0; i < len; i += 1) {
- if (1 || (result.data.rows[i].hasOwnProperty("id"))) {
- value = result.data.rows[i].id;
- result.data.rows[i].value.monitoring_status = {
+ if (1 || (result.data.rows[i].value.hasOwnProperty("Organisation_getNewsDict"))) {
+ value_jio_key = result.data.rows[i].id;
+ value = result.data.rows[i].value.Organisation_getNewsDict;
+ result.data.rows[i].value.Organisation_getNewsDict = {
field_gadget_param : {
css_class: "",
description: "The Status",
hidden: 0,
- "default": {jio_key: value},
+ "default": {jio_key: value_jio_key, result: value},
key: "status",
url: "gadget_slapos_site_status.html",
title: "Status",
@@ -75,7 +76,7 @@
['title', 'Title'],
['reference', 'Reference'],
['default_address_region_title', 'Region'],
- ['monitoring_status', 'Status']
+ ['Organisation_getNewsDict', 'Status']
];
destination_list = "%22NULL%22%2C";
for (i in result[1].assignment_destination_list) {
diff --git a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_site_list_js.xml b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_site_list_js.xml
index b4e2f1c5a4bcbeb92bb1b354a3b43941434c7a35..11cab4be9f9846a50bf68e29bb25a9471bc6fc2c 100644
--- a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_site_list_js.xml
+++ b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_site_list_js.xml
@@ -216,7 +216,7 @@
</item>
<item>
<key> <string>actor</string> </key>
- <value> <string>zope</string> </value>
+ <value> <string>superrafael</string> </value>
</item>
<item>
<key> <string>comment</string> </key>
@@ -230,7 +230,7 @@
</item>
<item>
<key> <string>serial</string> </key>
- <value> <string>972.34170.7223.58060</string> </value>
+ <value> <string>974.29228.49487.5973</string> </value>
</item>
<item>
<key> <string>state</string> </key>
@@ -248,7 +248,7 @@
</tuple>
<state>
<tuple>
- <float>1552959192.5</float>
+ <float>1554317319.46</float>
<string>UTC</string>
</tuple>
</state>
diff --git a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_start_hosting_subscription_js.js b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_start_hosting_subscription_js.js
index 9e8ae09113f5cdd61e62955ff78699dc520c81a4..fd2f8929bb5fc496d74016e36f86827bacfd7d7a 100644
--- a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_start_hosting_subscription_js.js
+++ b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_start_hosting_subscription_js.js
@@ -12,6 +12,7 @@
.declareAcquiredMethod("getUrlFor", "getUrlFor")
.declareAcquiredMethod("redirect", "redirect")
.declareAcquiredMethod("jio_post", "jio_post")
+ .declareAcquiredMethod("jio_get", "jio_get")
.declareAcquiredMethod("jio_putAttachment", "jio_putAttachment")
diff --git a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_start_hosting_subscription_js.xml b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_start_hosting_subscription_js.xml
index cefff243a2a35423be819ea8a7be30511a463203..19a05e4b0e7f95ffb5b43d7b84051763f88a35f1 100644
--- a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_start_hosting_subscription_js.xml
+++ b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_start_hosting_subscription_js.xml
@@ -259,7 +259,7 @@
</item>
<item>
<key> <string>actor</string> </key>
- <value> <string>zope</string> </value>
+ <value> <string>superrafael</string> </value>
</item>
<item>
<key> <string>comment</string> </key>
@@ -273,7 +273,7 @@
</item>
<item>
<key> <string>serial</string> </key>
- <value> <string>966.29726.26723.5427</string> </value>
+ <value> <string>967.29586.55987.8055</string> </value>
</item>
<item>
<key> <string>state</string> </key>
@@ -291,7 +291,7 @@
</tuple>
<state>
<tuple>
- <float>1522752587.64</float>
+ <float>1529596709.87</float>
<string>UTC</string>
</tuple>
</state>
diff --git a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_stop_hosting_subscription_js.js b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_stop_hosting_subscription_js.js
index b70ec35df01204a46cba7426ebc9bd84d4baf9e8..e672d34f959ff2dd2bffc9baed0e9159766e199b 100644
--- a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_stop_hosting_subscription_js.js
+++ b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_stop_hosting_subscription_js.js
@@ -12,6 +12,7 @@
.declareAcquiredMethod("getUrlFor", "getUrlFor")
.declareAcquiredMethod("redirect", "redirect")
.declareAcquiredMethod("jio_post", "jio_post")
+ .declareAcquiredMethod("jio_get", "jio_get")
.declareAcquiredMethod("jio_putAttachment", "jio_putAttachment")
@@ -93,7 +94,7 @@
})
.push(function (url_list) {
return gadget.updateHeader({
- page_title: "Destroy Hosting Subscription: " + options.doc.title,
+ page_title: "Stop Hosting Subscription: " + options.doc.title,
selection_url: url_list[0],
submit_action: true
});
diff --git a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_stop_hosting_subscription_js.xml b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_stop_hosting_subscription_js.xml
index 1aba79a499692b9582a8db01a2b98ebb3a4fe1aa..66525a751bfbde41233841c0b6476be9aad0ae82 100644
--- a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_stop_hosting_subscription_js.xml
+++ b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_stop_hosting_subscription_js.xml
@@ -259,7 +259,7 @@
</item>
<item>
<key> <string>actor</string> </key>
- <value> <string>zope</string> </value>
+ <value> <string>superrafael</string> </value>
</item>
<item>
<key> <string>comment</string> </key>
@@ -273,7 +273,7 @@
</item>
<item>
<key> <string>serial</string> </key>
- <value> <string>966.29726.36584.7355</string> </value>
+ <value> <string>968.24287.54461.29371</string> </value>
</item>
<item>
<key> <string>state</string> </key>
@@ -291,7 +291,7 @@
</tuple>
<state>
<tuple>
- <float>1522752577.81</float>
+ <float>1529594068.95</float>
<string>UTC</string>
</tuple>
</state>
diff --git a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slapos_js.js b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slapos_js.js
index 4ac380882462a9e16e694ea41ad530b794bbf384..800b9e94837aa7cf4ed4677f8db6da7f0b86ffa1 100644
--- a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slapos_js.js
+++ b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slapos_js.js
@@ -34,16 +34,17 @@
var gadget = this;
return gadget.jio_allDocs(param_list[0])
.push(function (result) {
- var i, value, date, len = result.data.total_rows;
+ var i, value, value_jio_key, date, len = result.data.total_rows;
for (i = 0; i < len; i += 1) {
if (1 || (result.data.rows[i].hasOwnProperty("id"))) {
- value = result.data.rows[i].id;
- result.data.rows[i].value.monitoring_status = {
+ value_jio_key = result.data.rows[i].id;
+ value = result.data.rows[i].value.Organisation_getNewsDict;
+ result.data.rows[i].value.Organisation_getNewsDict = {
field_gadget_param : {
css_class: "",
description: "The Status",
hidden: 0,
- "default": {jio_key: value},
+ "default": {jio_key: value_jio_key, result: value},
key: "status",
url: "gadget_slapos_site_status.html",
title: "Status",
@@ -110,7 +111,7 @@
.push(function (result) {
var i, destination_list, column_list = [
['title', 'Title'],
- ['monitoring_status', 'Status']
+ ['Organisation_getNewsDict', 'Status']
];
gadget.me_dict = result[1];
destination_list = "%22NULL%22%2C";
@@ -250,6 +251,7 @@
query: "portal_type:Organisation AND role_title:Host AND relative_url:(" + destination_list + ")",
select_list: ['title',
'reference',
+ 'Organisation_getNewsDict',
'default_geographical_location_longitude',
'default_geographical_location_latitude']
});
@@ -261,6 +263,7 @@
"jio_key": result.data.rows[idx].id,
"doc": {"title": result.data.rows[idx].value.title,
"reference": result.data.rows[idx].value.reference,
+ "result": result.data.rows[idx].value.Organisation_getNewsDict,
"latitude": result.data.rows[idx].value.default_geographical_location_latitude,
"longitude": result.data.rows[idx].value.default_geographical_location_longitude}
});
diff --git a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slapos_js.xml b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slapos_js.xml
index 04b6abb56921460ebd5c7972de3f989276dc88f5..21cba6b029bb73d4fd64942d06553e1f6c7f15a1 100644
--- a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slapos_js.xml
+++ b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slapos_js.xml
@@ -227,7 +227,7 @@
</item>
<item>
<key> <string>actor</string> </key>
- <value> <string>zope</string> </value>
+ <value> <string>superrafael</string> </value>
</item>
<item>
<key> <string>comment</string> </key>
@@ -241,7 +241,7 @@
</item>
<item>
<key> <string>serial</string> </key>
- <value> <string>974.29127.37243.30225</string> </value>
+ <value> <string>974.51826.62399.12902</string> </value>
</item>
<item>
<key> <string>state</string> </key>
@@ -259,7 +259,7 @@
</tuple>
<state>
<tuple>
- <float>1552958273.58</float>
+ <float>1554320110.18</float>
<string>UTC</string>
</tuple>
</state>
diff --git a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_hosting_subscription_status_html.xml b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_hosting_subscription_status_html.xml
index e75d58506476acf34f65b60b5be5024e738808b5..22a27467fe989de41c7126264bc2253aeb4fac69 100644
--- a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_hosting_subscription_status_html.xml
+++ b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_hosting_subscription_status_html.xml
@@ -258,7 +258,7 @@
</item>
<item>
<key> <string>actor</string> </key>
- <value> <string>zope</string> </value>
+ <value> <string>superrafael</string> </value>
</item>
<item>
<key> <string>comment</string> </key>
@@ -272,7 +272,7 @@
</item>
<item>
<key> <string>serial</string> </key>
- <value> <string>972.32024.53732.34406</string> </value>
+ <value> <string>970.21496.17710.36488</string> </value>
</item>
<item>
<key> <string>state</string> </key>
@@ -290,7 +290,7 @@
</tuple>
<state>
<tuple>
- <float>1554257675.61</float>
+ <float>1554255222.31</float>
<string>UTC</string>
</tuple>
</state>
diff --git a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_hosting_subscription_status_js.xml b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_hosting_subscription_status_js.xml
index 79ae5db79764f9d88e42ab7e756229aa81ed35f0..4a5afac4f24d04b86e19e44865e89febbe42c9ee 100644
--- a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_hosting_subscription_status_js.xml
+++ b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_hosting_subscription_status_js.xml
@@ -243,7 +243,7 @@
</item>
<item>
<key> <string>actor</string> </key>
- <value> <string>zope</string> </value>
+ <value> <string>superrafael</string> </value>
</item>
<item>
<key> <string>comment</string> </key>
@@ -257,7 +257,7 @@
</item>
<item>
<key> <string>serial</string> </key>
- <value> <string>972.32024.53732.34406</string> </value>
+ <value> <string>974.50748.25599.3686</string> </value>
</item>
<item>
<key> <string>state</string> </key>
@@ -275,7 +275,7 @@
</tuple>
<state>
<tuple>
- <float>1554257864.46</float>
+ <float>1554255778.44</float>
<string>UTC</string>
</tuple>
</state>
diff --git a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_instance_status_js.xml b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_instance_status_js.xml
index b91ecaff2b331d1aa552e33ab634f5ed1793b17f..b6503210cbf26b1687b0a7c3996016a6e9f50de2 100644
--- a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_instance_status_js.xml
+++ b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_instance_status_js.xml
@@ -243,7 +243,7 @@
</item>
<item>
<key> <string>actor</string> </key>
- <value> <string>zope</string> </value>
+ <value> <string>superrafael</string> </value>
</item>
<item>
<key> <string>comment</string> </key>
@@ -257,7 +257,7 @@
</item>
<item>
<key> <string>serial</string> </key>
- <value> <string>974.50044.7881.17544</string> </value>
+ <value> <string>974.50363.35694.46455</string> </value>
</item>
<item>
<key> <string>state</string> </key>
@@ -275,7 +275,7 @@
</tuple>
<state>
<tuple>
- <float>1554213380.38</float>
+ <float>1554236784.11</float>
<string>UTC</string>
</tuple>
</state>
diff --git a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_network_status_js.js b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_network_status_js.js
index 019d01a153eae8c7a3cbba8e121f17ca50e8bb1f..a248514b2371c7ad5df3147219040ef21095a649 100644
--- a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_network_status_js.js
+++ b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_network_status_js.js
@@ -68,8 +68,8 @@
var previous_status = "START",
status = 'ui-btn-no-data',
i;
- for (i in options.computer_news) {
- status = checkComputerStatus(options.computer_news[i]);
+ for (i in options.news.computer) {
+ status = checkComputerStatus(options.news.computer[i]);
if (previous_status === "START") {
previous_status = status;
}
@@ -92,9 +92,9 @@
var computer_reference,
status = 'ui-btn-no-data',
previous_status = "START";
- for (computer_reference in options.computer_partition_news) {
+ for (computer_reference in options.news.partition) {
status = checkComputerPartitionStatus(
- options.computer_partition_news[computer_reference]);
+ options.news.partition[computer_reference]);
if (previous_status === "START") {
previous_status = status;
}
@@ -117,36 +117,31 @@
return status;
}
- function getStatus(gadget) {
- return new RSVP.Queue()
+ function getStatus(gadget, result) {
+ var status_class = 'ui-btn-no-data',
+ status_title = 'Computer',
+ right_title = 'Partitions',
+ right_class = 'ui-btn-no-data';
+
+ status_class = checkNetworkStatus(result);
+ right_class = checkNetworkPartitionStatus(result);
+
+ gadget.element.innerHTML = inline_status_template({
+ status_class: status_class,
+ status_title: status_title,
+ right_class: right_class,
+ right_title: right_title
+ });
+ return gadget;
+ }
+
+ function getStatusLoop(gadget) {
+ return new RSVP.Queue()
.push(function () {
return gadget.jio_get(gadget.options.value.jio_key);
})
.push(function (result) {
- var status_class = 'ui-btn-no-data',
- status_title = 'Computer',
- right_title = 'Partitions',
- right_class = 'ui-btn-no-data',
- status_style = '',
- right_style = '';
-
- status_class = checkNetworkStatus(result);
- right_class = checkNetworkPartitionStatus(result);
-
-
- if (status_class === 'ui-btn-no-data') {
- status_style = "color: transparent !important;";
- }
-
- gadget.element.innerHTML = inline_status_template({
- status_class: status_class,
- status_title: status_title,
- status_style: status_style,
- right_class: right_class,
- right_title: right_title,
- right_style: right_style
- });
- return gadget;
+ return getStatus(gadget, result);
});
}
@@ -165,20 +160,19 @@
.declareMethod("getContent", function () {
return {};
})
- .declareJob("getStatus", function () {
+ .declareJob("getStatus", function (result) {
var gadget = this;
- return getStatus(gadget);
+ return getStatus(gadget, {news: result});
})
.onLoop(function () {
var gadget = this;
- return getStatus(gadget);
+ return getStatusLoop(gadget);
}, 300000)
.declareMethod("render", function (options) {
var gadget = this;
gadget.options = options;
gadget.flag = options.value.jio_key;
- return gadget.getStatus();
+ return gadget.getStatus(options.value.result);
});
-
}(window, rJS, RSVP, Handlebars));
\ No newline at end of file
diff --git a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_network_status_js.xml b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_network_status_js.xml
index 5b2947db622d573895081de80c43b711e983a965..4533712fcf9f90aabaeef4341d8b2d7da76e8b55 100644
--- a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_network_status_js.xml
+++ b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_network_status_js.xml
@@ -243,7 +243,7 @@
</item>
<item>
<key> <string>actor</string> </key>
- <value> <string>zope</string> </value>
+ <value> <string>superrafael</string> </value>
</item>
<item>
<key> <string>comment</string> </key>
@@ -257,7 +257,7 @@
</item>
<item>
<key> <string>serial</string> </key>
- <value> <string>968.33063.24201.50227</string> </value>
+ <value> <string>974.51836.28846.24849</string> </value>
</item>
<item>
<key> <string>state</string> </key>
@@ -275,7 +275,7 @@
</tuple>
<state>
<tuple>
- <float>1530119497.39</float>
+ <float>1554320626.62</float>
<string>UTC</string>
</tuple>
</state>
diff --git a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_project_status_js.js b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_project_status_js.js
index f68e2909c670734316088598bd0fa91fae3c8173..01131ffa58e4187ab06ee6adde4333e91663671c 100644
--- a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_project_status_js.js
+++ b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_project_status_js.js
@@ -68,8 +68,8 @@
var previous_status = "START",
status = 'ui-btn-no-data',
i;
- for (i in options.computer_news) {
- status = checkComputerStatus(options.computer_news[i]);
+ for (i in options.news.computer) {
+ status = checkComputerStatus(options.news.computer[i]);
if (previous_status === "START") {
previous_status = status;
}
@@ -92,9 +92,9 @@
var computer_reference,
status = 'ui-btn-no-data',
previous_status = "START";
- for (computer_reference in options.computer_partition_news) {
+ for (computer_reference in options.news.partition) {
status = checkComputerPartitionStatus(
- options.computer_partition_news[computer_reference]);
+ options.news.partition[computer_reference]);
if (previous_status === "START") {
previous_status = status;
}
@@ -118,39 +118,39 @@
}
- function getStatus(gadget) {
+ function getStatus(gadget, result) {
+ var monitor_url,
+ status_class = 'ui-btn-no-data',
+ status_title = 'Computer',
+ right_title = 'Partitions',
+ right_class = 'ui-btn-no-data',
+ status_style = '',
+ right_style = '';
+
+ status_class = checkProjectStatus(result);
+ right_class = checkProjectPartitionStatus(result);
+
+ monitor_url = gadget.props.hateoas_url + gadget.options.value.jio_key + '/Base_redirectToMonitor';
+ gadget.element.innerHTML = inline_status_template({
+ monitor_url: monitor_url,
+ status_class: status_class,
+ status_title: status_title,
+ status_style: status_style,
+ right_class: right_class,
+ right_title: right_title,
+ right_style: right_style
+ });
+ return gadget;
+ }
+
+ function getStatusLoop(gadget) {
return new RSVP.Queue()
.push(function () {
return gadget.jio_get(gadget.options.value.jio_key);
})
.push(function (result) {
- var monitor_url,
- status_class = 'ui-btn-no-data',
- status_title = 'Computer',
- right_title = 'Partitions',
- right_class = 'ui-btn-no-data',
- status_style = '',
- right_style = '';
-
- status_class = checkProjectStatus(result);
- right_class = checkProjectPartitionStatus(result);
-
- if (status_class === 'ui-btn-no-data') {
- status_style = "color: transparent !important;";
- }
- monitor_url = gadget.props.hateoas_url + gadget.options.value.jio_key + '/Base_redirectToMonitor';
- gadget.element.innerHTML = inline_status_template({
- monitor_url: monitor_url,
- status_class: status_class,
- status_title: status_title,
- status_style: status_style,
- right_class: right_class,
- right_title: right_title,
- right_style: right_style
- });
- return gadget;
- }
- );
+ return getStatus(gadget, result);
+ });
}
gadget_klass
@@ -168,19 +168,19 @@
.declareMethod("getContent", function () {
return {};
})
- .declareJob("getStatus", function () {
+ .declareJob("getStatus", function (result) {
var gadget = this;
- return getStatus(gadget);
+ return getStatus(gadget, {news: result});
})
.onLoop(function () {
var gadget = this;
- return getStatus(gadget);
+ return getStatusLoop(gadget);
}, 300000)
.declareMethod("render", function (options) {
var gadget = this;
gadget.options = options;
gadget.flag = options.value.jio_key;
- return gadget.getStatus();
+ return gadget.getStatus(options.value.result);
});
}(window, rJS, RSVP, Handlebars));
\ No newline at end of file
diff --git a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_project_status_js.xml b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_project_status_js.xml
index aa1df972d9ebdbe29f3c30470e55828a49af67e0..6979b1884c28e7224d149f5c062883b93282f495 100644
--- a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_project_status_js.xml
+++ b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_project_status_js.xml
@@ -243,7 +243,7 @@
</item>
<item>
<key> <string>actor</string> </key>
- <value> <string>zope</string> </value>
+ <value> <string>superrafael</string> </value>
</item>
<item>
<key> <string>comment</string> </key>
@@ -257,7 +257,7 @@
</item>
<item>
<key> <string>serial</string> </key>
- <value> <string>968.33071.21265.51541</string> </value>
+ <value> <string>974.51745.60684.16657</string> </value>
</item>
<item>
<key> <string>state</string> </key>
@@ -275,7 +275,7 @@
</tuple>
<state>
<tuple>
- <float>1530119961.69</float>
+ <float>1554315362.25</float>
<string>UTC</string>
</tuple>
</state>
diff --git a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_site_status_js.js b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_site_status_js.js
index 83255aa370fd20616d81a19fc2b4e31336e68735..0817a0bd023dfe48202028869be516fe0928dd1b 100644
--- a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_site_status_js.js
+++ b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_site_status_js.js
@@ -68,8 +68,8 @@
var previous_status = "START",
status = 'ui-btn-no-data',
i;
- for (i in options.computer_news) {
- status = checkComputerStatus(options.computer_news[i]);
+ for (i in options.news.computer) {
+ status = checkComputerStatus(options.news.computer[i]);
if (previous_status === "START") {
previous_status = status;
}
@@ -92,9 +92,9 @@
var computer_reference,
status = 'ui-btn-no-data',
previous_status = "START";
- for (computer_reference in options.computer_partition_news) {
+ for (computer_reference in options.news.partition) {
status = checkComputerPartitionStatus(
- options.computer_partition_news[computer_reference]);
+ options.news.partition[computer_reference]);
if (previous_status === "START") {
previous_status = status;
}
@@ -117,42 +117,39 @@
return status;
}
- function getStatus(gadget) {
+ function getStatus(gadget, result) {
+ var monitor_url,
+ status_class = 'ui-btn-no-data',
+ status_title = 'Computer',
+ right_title = 'Partitions',
+ right_class = 'ui-btn-no-data',
+ status_style = '',
+ right_style = '';
+
+ status_class = checkSiteStatus(result);
+ right_class = checkSitePartitionStatus(result);
+
+ monitor_url = gadget.props.hateoas_url + gadget.options.value.jio_key + '/Base_redirectToMonitor';
+ gadget.element.innerHTML = inline_status_template({
+ monitor_url: monitor_url,
+ status_class: status_class,
+ status_title: status_title,
+ status_style: status_style,
+ right_class: right_class,
+ right_title: right_title,
+ right_style: right_style
+ });
+ return gadget;
+ }
+
+ function getStatusLoop(gadget) {
return new RSVP.Queue()
.push(function () {
return gadget.jio_get(gadget.options.value.jio_key);
})
.push(function (result) {
- var monitor_url,
- status_class = 'ui-btn-no-data',
- status_title = 'Computer',
- right_title = 'Partitions',
- right_class = 'ui-btn-no-data',
- status_style = "color: transparent !important;",
- right_style = 'color: transparent !important;';
-
- status_class = checkSiteStatus(result);
- right_class = checkSitePartitionStatus(result);
-
- right_style = '';
- status_style = '';
-
- if (status_class === 'ui-btn-no-data') {
- status_style = "color: transparent !important;";
- }
- monitor_url = gadget.props.hateoas_url + gadget.options.value.jio_key + '/Base_redirectToMonitor';
- gadget.element.innerHTML = inline_status_template({
- monitor_url: monitor_url,
- status_class: status_class,
- status_title: status_title,
- status_style: status_style,
- right_class: right_class,
- right_title: right_title,
- right_style: right_style
- });
- return gadget;
- }
- );
+ return getStatus(gadget, result);
+ });
}
gadget_klass
@@ -170,20 +167,19 @@
.declareMethod("getContent", function () {
return {};
})
-
- .declareJob("getStatus", function () {
+ .declareJob("getStatus", function (result) {
var gadget = this;
- return getStatus(gadget);
+ return getStatus(gadget, {news: result});
})
.onLoop(function () {
var gadget = this;
- return getStatus(gadget);
+ return getStatusLoop(gadget);
}, 300000)
.declareMethod("render", function (options) {
var gadget = this;
gadget.options = options;
gadget.flag = options.value.jio_key;
- return gadget.getStatus();
+ return gadget.getStatus(options.value.result);
});
}(window, rJS, RSVP, Handlebars));
\ No newline at end of file
diff --git a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_site_status_js.xml b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_site_status_js.xml
index a97ee4f818bb17b1a14934ebcb1880af444f5655..118417ba765314ec9a265212f2715fc9387fe248 100644
--- a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_site_status_js.xml
+++ b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_site_status_js.xml
@@ -254,7 +254,7 @@
</item>
<item>
<key> <string>actor</string> </key>
- <value> <string>zope</string> </value>
+ <value> <string>superrafael</string> </value>
</item>
<item>
<key> <string>comment</string> </key>
@@ -268,7 +268,7 @@
</item>
<item>
<key> <string>serial</string> </key>
- <value> <string>966.58781.43824.3635</string> </value>
+ <value> <string>969.37904.40841.53947</string> </value>
</item>
<item>
<key> <string>state</string> </key>
@@ -286,7 +286,7 @@
</tuple>
<state>
<tuple>
- <float>1530119121.08</float>
+ <float>1554317692.05</float>
<string>UTC</string>
</tuple>
</state>