Skip to content

S
slapos.core
Commit 2e34365b authored by Thomas Gambier's avatar Thomas Gambier 🚴🏼 Committed by Rafael Monnerat
Browse files
Options

Fix display of upgrade decision 

I'm now displaying the upgrade decision message as HTML. @rafael  I'm not sure if I should do the same in `rjs_gadget_erp5_page_slap_ticket_view_js.js` and `rjs_gadget_erp5_page_slap_regularisation_request_view_js.js`

/cc @alain.takoudjou

/reviewed-on nexedi/slapos.core!103
parent 3156633c
Show whitespace changes
Inline Side-by-side
Showing with 14 additions and 14 deletions
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_upgrade_decision_view_js.js
View file @ 2e34365b
......@@ -27,13 +27,13 @@
// This code can cause problems if it is used more them once per
// page
param_list[0].sort_on = [["modification_date", "ascending"]];
param_list[0].select_list = ["uid", "title", "text_content",
param_list[0].select_list = ["uid", "title", "asStrippedHTML",
"source_title", "modification_date", "content_type"];
return gadget.jio_allDocs(param_list[0])
.push(function (result) {
var i, len = result.data.total_rows;
for (i = 0; i < len; i += 1) {
if (1 || (result.data.rows[i].value.hasOwnProperty("text_content"))) {
if (1 || (result.data.rows[i].value.hasOwnProperty("asStrippedHTML"))) {
result.data.rows[i].value.text_content = {
css_class: "",
description: "The Status",
......@@ -42,7 +42,7 @@
source: result.data.rows[i].value.source_title,
modification_date: result.data.rows[i].value.modification_date,
content_type: result.data.rows[i].value.content_type,
text_content: result.data.rows[i].value.text_content}},
text_content: result.data.rows[i].value.asStrippedHTML}},
key: "status",
url: "gadget_slapos_event_discussion_entry.html",
title: "Status",
......
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_upgrade_decision_view_js.xml
View file @ 2e34365b
......@@ -216,7 +216,7 @@
</item>
<item>
<key> <string>actor</string> </key>
<value> <string>zope</string> </value>
<value> <string>superthomas</string> </value>
</item>
<item>
<key> <string>comment</string> </key>
......@@ -230,7 +230,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>969.17860.58360.20480</string> </value>
<value> <string>969.37904.40841.53947</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -248,7 +248,7 @@
</tuple>
<state>
<tuple>
<float>1533056219.23</float>
<float>1552496165.88</float>
<string>UTC</string>
</tuple>
</state>
......
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_event_discussion_entry_html.html
View file @ 2e34365b
......@@ -29,7 +29,7 @@
<p>By <strong>{{author}} </strong> on {{modification_date}}: </p>
</div>
<div class="slapos-event-discussion-message-body"></div>
<div class="slapos-event-discussion-message-body">{{{message}}}</div>
</script>
</head>
......
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_event_discussion_entry_html.xml
View file @ 2e34365b
......@@ -220,7 +220,7 @@
</item>
<item>
<key> <string>actor</string> </key>
<value> <string>ERP5TypeTestCase</string> </value>
<value> <string>superthomas</string> </value>
</item>
<item>
<key> <string>comment</string> </key>
......@@ -234,7 +234,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>965.42375.23341.30156</string> </value>
<value> <string>974.21419.55105.18158</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -252,7 +252,7 @@
</tuple>
<state>
<tuple>
<float>1519232226.72</float>
<float>1552496307.06</float>
<string>UTC</string>
</tuple>
</state>
......
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_event_discussion_entry_js.js
View file @ 2e34365b
......@@ -11,7 +11,7 @@
inline_html_event_source = gadget_klass.__template_element
.getElementById("inline-html-event-template")
.innerHTML,
inline_html_status_template = Handlebars.compile(inline_event_source);
inline_html_status_template = Handlebars.compile(inline_html_event_source);
gadget_klass
......
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_event_discussion_entry_js.xml
View file @ 2e34365b
......@@ -216,7 +216,7 @@
</item>
<item>
<key> <string>actor</string> </key>
<value> <string>ERP5TypeTestCase</string> </value>
<value> <string>superthomas</string> </value>
</item>
<item>
<key> <string>comment</string> </key>
......@@ -230,7 +230,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>963.7958.61571.55040</string> </value>
<value> <string>974.21419.16980.58675</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -248,7 +248,7 @@
</tuple>
<state>
<tuple>
<float>1519227607.46</float>
<float>1552579622.59</float>
<string>UTC</string>
</tuple>
</state>
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7