Commit 937ed31e authored by Rafael Monnerat's avatar Rafael Monnerat

Minor bugs found on post production post upgrade

See merge request !410
parents 60ec7cd8 cf326afc
...@@ -11,12 +11,16 @@ ...@@ -11,12 +11,16 @@
}) })
.onStateChange(function () { .onStateChange(function () {
var gadget = this, var gadget = this,
header_text = "By <strong>" + gadget.state.author + header_text_element = domsugar('p', [
"</strong> on " + gadget.state.modification_date + ":", 'By ',
domsugar('strong', {text: gadget.state.author}),
' on ',
gadget.state.modification_date,
':']),
header = domsugar("div", { header = domsugar("div", {
class: "slapos-event-discussion-message-header" class: "slapos-event-discussion-message-header"
}, [ }, [
domsugar('p', {html: header_text}) header_text_element
]); ]);
if (gadget.state.content_type === 'text/html') { if (gadget.state.content_type === 'text/html') {
return domsugar(gadget.element, {}, [ return domsugar(gadget.element, {}, [
......
...@@ -236,7 +236,7 @@ ...@@ -236,7 +236,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>1001.26171.19762.42854</string> </value> <value> <string>1002.9606.37397.136</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -254,7 +254,7 @@ ...@@ -254,7 +254,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1659986314.17</float> <float>1660875500.26</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -123,8 +123,15 @@ ...@@ -123,8 +123,15 @@
])); ]));
} }
domsugar(gadget.element.querySelector("ul"), return domsugar(gadget.element.querySelector("ul"),
[domsugar(null, element_list)]); [domsugar(null, element_list)]);
})
.push(function () {
return gadget.getDeclaredGadget('erp5_panel_shortcut');
})
.push(function (shortcut_gadget) {
// Ensure links are updated
return shortcut_gadget.render({update: 1});
}); });
} }
// Check for Alerts to pop // Check for Alerts to pop
......
...@@ -255,7 +255,7 @@ ...@@ -255,7 +255,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>1001.36662.17855.30088</string> </value> <value> <string>1002.19336.55332.19763</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -273,7 +273,7 @@ ...@@ -273,7 +273,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1657677595.88</float> <float>1660570147.61</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
/*globals console, window, rJS, i18n, domsugar*/ /*globals console, window, rJS, i18n, domsugar */
/*jslint indent: 2, nomen: true, maxlen: 80*/ /*jslint indent: 2, nomen: true, maxlen: 80 */
(function (window, rJS, domsugar) { (function (window, rJS, domsugar) {
"use strict"; "use strict";
...@@ -230,9 +230,7 @@ ...@@ -230,9 +230,7 @@
right_class = status_class; right_class = status_class;
} else { } else {
if (result && result.partition) { if (result && result.partition) {
right_class = getComputePartitionStatus( right_class = getComputePartitionStatus(result.partition);
{compute_partition_news: result.partition}
);
} }
} }
} else if (result && result.portal_type && } else if (result && result.portal_type &&
......
...@@ -292,7 +292,7 @@ ...@@ -292,7 +292,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1658520198.62</float> <float>1660581838.54</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -13,9 +13,9 @@ if context.getPortalType() == "Computer Network": ...@@ -13,9 +13,9 @@ if context.getPortalType() == "Computer Network":
return base_url + "aggregate_reference:(%s)" % compute_node_reference return base_url + "aggregate_reference:(%s)" % compute_node_reference
if context.getPortalType() == "Instance Tree": if context.getPortalType() == "Instance Tree":
for connection_parameter in context.InstanceTree_getConnectionParameterList(): for connection_parameter in context.InstanceTree_getConnectionParameterList(raw=True):
if connection_parameter['connection_key'] == "monitor-setup-url": if connection_parameter['connection_key'] == "monitor-setup-url":
return context.REQUEST.RESPONSE.redirect(connection_parameter['connection_key']) return connection_parameter['connection_value']
base_url = 'https://monitor.app.officejs.com/#/?page=ojsm_dispatch&query=portal_type:"Instance Tree" AND ' base_url = 'https://monitor.app.officejs.com/#/?page=ojsm_dispatch&query=portal_type:"Instance Tree" AND '
return base_url + "title:(%s)" % context.getTitle() return base_url + "title:(%s)" % context.getTitle()
......
...@@ -21,7 +21,7 @@ for instance in instance_list: ...@@ -21,7 +21,7 @@ for instance in instance_list:
compute_node_list.append(partition.getParentValue().getUid()) compute_node_list.append(partition.getParentValue().getUid())
if compute_node_list is None: if not compute_node_list:
return True return True
full_software_installation_list = [si for si in full_software_installation_list = [si for si in
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment