Commit 347ede28 by Alain Takoudjou

[slapos_jio] add menu to view all unread messages

List unread messages of user in a listbox, once user open the message it's marked as readed and will not be listed anymore.

Unread messages are show at home page, on top of Map gadget so the user will always see messages when he connect to the master.
1 parent c721d93e
Showing 28 changed files with 390 additions and 36 deletions
<!DOCTYPE html>
<html>
<!--
data-i18n=Slapos
-->
<head>
<meta http-equiv="Content-type" content="text/html; charset=utf-8" />
<meta name="viewport" content="width=device-width, user-scalable=no" />
<title>Site List</title>
<!-- renderjs -->
<script src="rsvp.js" type="text/javascript"></script>
<script src="renderjs.js" type="text/javascript"></script>
<!-- custom script -->
<script src="gadget_erp5_page_slap_message_list.js" type="text/javascript"></script>
</head>
<body>
<div data-gadget-url="gadget_erp5_pt_form_list.html" data-gadget-scope="form_list"></div>
</body>
</html>
/*global window, rJS, RSVP */
/*jslint nomen: true, indent: 2, maxerr: 3*/
(function (window, rJS, RSVP) {
"use strict";
rJS(window)
.declareAcquiredMethod("updateHeader", "updateHeader")
.declareAcquiredMethod("getSetting", "getSetting")
.declareAcquiredMethod("setSetting", "setSetting")
.declareAcquiredMethod("getUrlFor", "getUrlFor")
.declareAcquiredMethod("jio_allDocs", "jio_allDocs")
.declareAcquiredMethod("jio_get", "jio_get")
/////////////////////////////////////////////////////////////////
// declared methods
/////////////////////////////////////////////////////////////////
.allowPublicAcquisition("jio_allDocs", function (param_list) {
var gadget = this;
return gadget.jio_allDocs(param_list[0])
.push(function (result) {
var i, j, tmp, value, len = result.data.total_rows;
for (i = 0; i < len; i += 1) {
if (result.data.rows[i].value.hasOwnProperty("modification_date")) {
result.data.rows[i].value.modification_date = {
css_class: "date_field",
date_only: 0,
description: "The Date",
editable: 0,
hidden: 0,
hidden_day_is_last_day: 0,
"default": result.data.rows[i].value.modification_date,
key: "modification_date",
required: 0,
timezone_style: 0,
title: "Message Date",
type: "DateTimeField"
};
result.data.rows[i].value["listbox_uid:list"] = {
key: "listbox_uid:list",
value: 2713
};
}
if (result.data.rows[i].value.hasOwnProperty("text_content")) {
if (result.data.rows[i].value.text_content &&
result.data.rows[i].value.text_content.length > 80) {
result.data.rows[i].value.text_content =
result.data.rows[i].value.text_content.slice(0, 80) + " ...";
}
}
}
return result;
});
})
.declareMethod("triggerSubmit", function () {
var argument_list = arguments;
return this.getDeclaredGadget('form_list')
.push(function (gadget) {
return gadget.triggerSubmit.apply(gadget, argument_list);
});
})
.declareMethod("render", function (options) {
var gadget = this,
lines_limit;
return new RSVP.Queue()
.push(function () {
return RSVP.all([
gadget.getSetting("listbox_lines_limit", 20),
gadget.getSetting("me")
]);
})
.push(function (setting) {
lines_limit = setting[0];
return RSVP.all([
gadget.getDeclaredGadget('form_list'),
gadget.jio_get(setting[1])
]);
})
.push(function (result) {
var column_list = [
['title', 'Title'],
['modification_date', 'Date'],
['source_title', "From"],
['text_content', 'Message']
//['follow_up', 'Ticket']
];
return result[0].render({
erp5_document: {
"_embedded": {"_view": {
"listbox": {
"column_list": column_list,
"show_anchor": 0,
"default_params": {},
"editable": 0,
"editable_column_list": [],
"key": "slap_message_listbox",
"lines": lines_limit,
"list_method": "portal_catalog",
"query": "urn:jio:allDocs?query=portal_type%3A%20%28%20" +
"%22" + "Web Message" + "%22%2C%20%22" + "Mail Message" +
"%22%29%20AND%20%28" + "default_destination_reference" +
"%3A" + result[1].reference + "%29%20AND%20%28" +
"simulation_state" + "%3A%20%28%22" + "started" +
"%22%2C%22" + "stopped" + "%22%29%29%20AND%20%28" +
"follow_up_portal_type" + "%3A%20%28%22" + "Support Request" +
"%22%2C%22" + "Upgrade Decision" + "%22%2C%22" +
"Regularisation Request" + "%22%29%29%20AND%20%28" +
"follow_up_simulation_state" + "%3A%20%28%22" +
"validated" + "%22%2C%22" + "suspended" + "%22%2C%22" +
"confirmed" + "%22%2C%22" + "started" + "%22%2C%22" +
"stopped" + "%22%2C%22" + "%22%29%29",
"portal_type": [],
"search_column_list": column_list,
"sort_column_list": column_list,
"sort": [["modification_date", "Descending"]],
"title": "Messages",
"type": "ListBox"
}
}},
"_links": {
"type": {
// form_list display portal_type in header
name: ""
}
}
},
form_definition: {
group_list: [[
"bottom",
[["listbox"]]
]]
}
});
})
.push(function (result) {
return RSVP.all([
gadget.getUrlFor({command: "change", options: {"page": "slap_rss_ticket"}}),
gadget.getUrlFor({command: "change", options: {"page": "slapos"}}),
gadget.getUrlFor({command: "change", options: {"page": "slap_rss_critical_ticket"}})
]);
})
.push(function (result) {
return gadget.updateHeader({
page_title: "Messages",
filter_action: true,
selection_url: result[1],
rss_url: result[0],
critical_url: result[2]
});
});
});
}(window, rJS, RSVP));
\ No newline at end of file \ No newline at end of file
<!DOCTYPE html>
<html>
<!--
data-i18n=Slapos
-->
<head>
<meta http-equiv="Content-type" content="text/html; charset=utf-8" />
<meta name="viewport" content="width=device-width, user-scalable=no" />
<title>Message View</title>
<!-- renderjs -->
<script src="rsvp.js" type="text/javascript"></script>
<script src="renderjs.js" type="text/javascript"></script>
<!-- custom script -->
<script src="gadget_erp5_page_slap_message_view.js" type="text/javascript"></script>
</head>
<body>
<body>
</body>
</body>
</html>
/*global window, rJS */
/*jslint nomen: true, indent: 2, maxerr: 3 */
(function (window, rJS) {
"use strict";
rJS(window)
/////////////////////////////////////////////////////////////////
// Acquired methods
/////////////////////////////////////////////////////////////////
.declareAcquiredMethod("redirect", "redirect")
/////////////////////////////////////////////////////////////////
// declared methods
/////////////////////////////////////////////////////////////////
.declareMethod("render", function (options) {
// Open the ticket directly
return this.redirect({
"command": "change",
"options": {"jio_key": options.doc.follow_up}
});
});
}(window, rJS));
\ No newline at end of file \ No newline at end of file
...@@ -234,7 +234,7 @@ ...@@ -234,7 +234,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>962.57488.48170.50312</string> </value> <value> <string>972.8019.52352.28876</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -252,7 +252,7 @@ ...@@ -252,7 +252,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1508424107.98</float> <float>1544099821.24</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -49,9 +49,14 @@ ...@@ -49,9 +49,14 @@
.push(function (result) { .push(function (result) {
if (result.portal_type !== undefined) { if (result.portal_type !== undefined) {
child_gadget_url = 'gadget_erp5_page_slap_' + if (["Web Message", "Mail Message"]
result.portal_type.replace(/ /g, '_').toLowerCase() + .indexOf(result.portal_type) !== -1) {
'_view.html'; child_gadget_url = 'gadget_erp5_page_slap_message_view.html';
} else {
child_gadget_url = 'gadget_erp5_page_slap_' +
result.portal_type.replace(/ /g, '_').toLowerCase() +
'_view.html';
}
} else { } else {
throw new Error('Can not display document: ' + options.jio_key); throw new Error('Can not display document: ' + options.jio_key);
} }
......
...@@ -230,7 +230,7 @@ ...@@ -230,7 +230,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>964.64854.62654.27545</string> </value> <value> <string>972.24145.27625.63436</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -248,7 +248,7 @@ ...@@ -248,7 +248,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1516644220.55</float> <float>1545062511.01</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
.box-gadget-left { .box-gadget-left {
width: 49%; width: 49%;
float: left; float: left;
margin-bottom: 30px;
} }
.box-gadget-right { .box-gadget-right {
width: 49%; width: 49%;
float: right; float: right;
} }
.box-gadget-bottom { .box-gadget-top {
float: left; float: left;
width: 100%; width: 100%;
padding-top: 17px; margin-bottom: 20px;
} }
.ui-btn-white-front, .ui-btn-white-front,
......
...@@ -75,6 +75,12 @@ ...@@ -75,6 +75,12 @@
</value> </value>
</item> </item>
<item> <item>
<key> <string>categories</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>content_md5</string> </key> <key> <string>content_md5</string> </key>
<value> <value>
<none/> <none/>
...@@ -245,7 +251,7 @@ ...@@ -245,7 +251,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>966.40300.60783.54357</string> </value> <value> <string>972.24386.22001.41932</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -263,7 +269,7 @@ ...@@ -263,7 +269,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1522775894.53</float> <float>1545068727.54</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<script id="ticket-link-control-template" type="text/x-handlebars-template"> <script id="ticket-link-control-template" type="text/x-handlebars-template">
<div class="slapos-control-front"> <div class="slapos-control-front">
<center> <center>
<a class="ui-btn ui-first-child ui-btn-white-front ui-btn-icon-left ui-icon-sort-alpha-asc" href={{ show_all_url }} data-i18n="Show All Tickets" > Show All Tickets</a> <a class="ui-btn ui-first-child ui-btn-white-front ui-btn-icon-left ui-icon-sort-alpha-asc" href={{ show_all_url }} data-i18n="Show Tickets" > Show Tickets</a>
<a class="ui-btn ui-first-child ui-btn-white-front ui-btn-icon-left ui-icon-rss" href={{ rss_all_url }} data-i18n="RSS (all)" > RSS </a> <a class="ui-btn ui-first-child ui-btn-white-front ui-btn-icon-left ui-icon-rss" href={{ rss_all_url }} data-i18n="RSS (all)" > RSS </a>
<a class="ui-btn ui-first-child ui-btn-white-front ui-btn-icon-left ui-icon-rss" href={{ rss_critical_url }} data-i18n="RSS Critical" > Critical </a> <a class="ui-btn ui-first-child ui-btn-white-front ui-btn-icon-left ui-icon-rss" href={{ rss_critical_url }} data-i18n="RSS Critical" > Critical </a>
</center> </center>
...@@ -30,6 +30,10 @@ ...@@ -30,6 +30,10 @@
</head> </head>
<body> <body>
<form> <form>
<div class="box-gadget-top">
<div data-gadget-url="gadget_erp5_pt_form_view.html"
data-gadget-scope="last"></div>
</div>
<div class="box-gadget-left"> <div class="box-gadget-left">
<div class="map-gadget"></div> <div class="map-gadget"></div>
</div> </div>
...@@ -37,10 +41,6 @@ ...@@ -37,10 +41,6 @@
<div data-gadget-url="gadget_erp5_pt_form_view.html" <div data-gadget-url="gadget_erp5_pt_form_view.html"
data-gadget-scope="right"></div> data-gadget-scope="right"></div>
</div> </div>
<div class="box-gadget-bottom">
<div data-gadget-url="gadget_erp5_pt_form_view.html"
data-gadget-scope="last"></div>
</div>
</form> </form>
</body> </body>
</html> </html>
\ No newline at end of file \ No newline at end of file
...@@ -75,6 +75,12 @@ ...@@ -75,6 +75,12 @@
</value> </value>
</item> </item>
<item> <item>
<key> <string>categories</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>content_md5</string> </key> <key> <string>content_md5</string> </key>
<value> <value>
<none/> <none/>
...@@ -245,7 +251,7 @@ ...@@ -245,7 +251,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>966.40689.62566.35447</string> </value> <value> <string>972.24383.44291.21572</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -263,7 +269,7 @@ ...@@ -263,7 +269,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1522799337.96</float> <float>1545068611.18</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -72,6 +72,13 @@ ...@@ -72,6 +72,13 @@
type: "DateTimeField" type: "DateTimeField"
}; };
} }
if (result.data.rows[i].value.hasOwnProperty("text_content")) {
if (result.data.rows[i].value.text_content &&
result.data.rows[i].value.text_content.length > 80) {
result.data.rows[i].value.text_content =
result.data.rows[i].value.text_content.slice(0, 80) + " ...";
}
}
} }
return result; return result;
}); });
...@@ -169,8 +176,9 @@ ...@@ -169,8 +176,9 @@
var form_list = result[0], var form_list = result[0],
column_list = [ column_list = [
['title', 'Title'], ['title', 'Title'],
['modification_date', 'Modification Date'], ['modification_date', 'Date'],
['translated_simulation_state_title', 'State'] ['source_title', "From"],
['text_content', 'Message']
]; ];
return form_list.render({ return form_list.render({
...@@ -200,13 +208,24 @@ ...@@ -200,13 +208,24 @@
"key": "slap_ticket_listbox", "key": "slap_ticket_listbox",
"lines": lines_limit, "lines": lines_limit,
"list_method": "portal_catalog", "list_method": "portal_catalog",
"query": "urn:jio:allDocs?query=portal_type%3A%20%28%22Support%20Request%22%2C%20%22Upgrade%20Decision%22%2C%20%22Regularisation%20Request%22%29%20AND%20" + "query": "urn:jio:allDocs?query=portal_type%3A%20%28%20" +
"destination_decision_reference%3A" + gadget.me_dict.reference + "%20AND%20simulation_state%3A%20%28%22suspended%22%2C%20%22validated%22%2C%20%22confirmed%22%29", "%22" + "Web Message" + "%22%2C%20%22" + "Mail Message" +
"%22%29%20AND%20%28" + "default_destination_reference" +
"%3A" + gadget.me_dict.reference + "%29%20AND%20%28" +
"simulation_state" + "%3A%20%28%22" + "started" +
"%22%2C%22" + "stopped" + "%22%29%29%20AND%20%28" +
"follow_up_portal_type" + "%3A%20%28%22" + "Support Request" +
"%22%2C%22" + "Upgrade Decision" + "%22%2C%22" +
"Regularisation Request" + "%22%29%29%20AND%20%28" +
"follow_up_simulation_state" + "%3A%20%28%22" +
"validated" + "%22%2C%22" + "suspended" + "%22%2C%22" +
"confirmed" + "%22%2C%22" + "started" + "%22%2C%22" +
"stopped" + "%22%2C%22" + "%22%29%29",
"portal_type": [], "portal_type": [],
"search_column_list": column_list, "search_column_list": column_list,
"sort_column_list": column_list, "sort_column_list": column_list,
"sort": [["modification_date", "Descending"]], "sort": [["modification_date", "Descending"]],
"title": "Pending Tickets to Process", "title": "Unread Messages",
"type": "ListBox" "type": "ListBox"
} }
}}, }},
......
...@@ -75,6 +75,12 @@ ...@@ -75,6 +75,12 @@
</value> </value>
</item> </item>
<item> <item>
<key> <string>categories</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>content_md5</string> </key> <key> <string>content_md5</string> </key>
<value> <value>
<none/> <none/>
...@@ -241,7 +247,7 @@ ...@@ -241,7 +247,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>966.41526.6603.40089</string> </value> <value> <string>972.24390.60760.64256</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -259,7 +265,7 @@ ...@@ -259,7 +265,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1522849395.6</float> <float>1545068588.17</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -108,7 +108,7 @@ ...@@ -108,7 +108,7 @@
<value> <string encoding="cdata"><![CDATA[ <value> <string encoding="cdata"><![CDATA[
CACHE MANIFEST\n CACHE MANIFEST\n
# generated on Fri, 23 Nov 2018 12:00:00 GMT+0200\n # generated on Fri, 17 Dec 2018 12:00:00 GMT+0200\n
CACHE:\n CACHE:\n
favicon.ico\n favicon.ico\n
font-awesome/font-awesome-webfont.eot?v=4.6.3\n font-awesome/font-awesome-webfont.eot?v=4.6.3\n
...@@ -309,6 +309,10 @@ gadget_erp5_page_slap_invoice_list.html\n ...@@ -309,6 +309,10 @@ gadget_erp5_page_slap_invoice_list.html\n
gadget_erp5_page_slap_invoice_list.js\n gadget_erp5_page_slap_invoice_list.js\n
gadget_erp5_page_slap_load_schema.html\n gadget_erp5_page_slap_load_schema.html\n
gadget_erp5_page_slap_load_schema.js\n gadget_erp5_page_slap_load_schema.js\n
gadget_erp5_page_slap_message_list_html\n
gadget_erp5_page_slap_message_list_js\n
gadget_erp5_page_slap_message_view_html\n
gadget_erp5_page_slap_message_view_js\n
gadget_erp5_page_slap_network_list.html\n gadget_erp5_page_slap_network_list.html\n
gadget_erp5_page_slap_network_list.js\n gadget_erp5_page_slap_network_list.js\n
gadget_erp5_page_slap_organisation_view.html\n gadget_erp5_page_slap_organisation_view.html\n
...@@ -557,7 +561,7 @@ NETWORK:\n ...@@ -557,7 +561,7 @@ NETWORK:\n
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>971.7563.45762.64836</string> </value> <value> <string>972.24295.54252.29815</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -575,7 +579,7 @@ NETWORK:\n ...@@ -575,7 +579,7 @@ NETWORK:\n
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1542984329.71</float> <float>1545062887.64</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
<ul data-role="listview" class="ui-listview" data-enhanced="true"> <ul data-role="listview" class="ui-listview" data-enhanced="true">
<li class="ui-first-child"><a href="#?editable=true" class="ui-btn ui-btn-icon-left ui-icon-home" data-i18n="Home" accesskey="h">Home</a></li> <li class="ui-first-child"><a href="#?editable=true" class="ui-btn ui-btn-icon-left ui-icon-home" data-i18n="Home" accesskey="h">Home</a></li>
<li><a href="{{person_href}}" class="ui-btn ui-btn-icon-left ui-icon-user" data-i18n="Account" accesskey="p">Account</a></li> <li><a href="{{person_href}}" class="ui-btn ui-btn-icon-left ui-icon-user" data-i18n="Account" accesskey="p">Account</a></li>
<li><a href="{{message_href}}" class="ui-btn ui-btn-icon-left ui-icon-envelope" data-i18n="Unread Messages" accesskey="m">Unread Messages</a></li>
<li><a href="{{support_request_href}}" class="ui-btn ui-btn-icon-left ui-icon-comments" data-i18n="Tickets" accesskey="t">Tickets</a></li> <li><a href="{{support_request_href}}" class="ui-btn ui-btn-icon-left ui-icon-comments" data-i18n="Tickets" accesskey="t">Tickets</a></li>
<li><a href="{{organisation_href}}" class="ui-btn ui-btn-icon-left ui-icon-map-marker" data-i18n="Sites" accesskey="k">Sites</a></li> <li><a href="{{organisation_href}}" class="ui-btn ui-btn-icon-left ui-icon-map-marker" data-i18n="Sites" accesskey="k">Sites</a></li>
<li><a href="{{project_href}}" class="ui-btn ui-btn-icon-left ui-icon-cubes" data-i18n="Projects" accesskey="w">Projects</a></li> <li><a href="{{project_href}}" class="ui-btn ui-btn-icon-left ui-icon-cubes" data-i18n="Projects" accesskey="w">Projects</a></li>
......
...@@ -64,6 +64,12 @@ ...@@ -64,6 +64,12 @@
</value> </value>
</item> </item>
<item> <item>
<key> <string>categories</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>content_md5</string> </key> <key> <string>content_md5</string> </key>
<value> <value>
<none/> <none/>
...@@ -220,7 +226,7 @@ ...@@ -220,7 +226,7 @@
</item> </item>
<item> <item>
<key> <string>actor</string> </key> <key> <string>actor</string> </key>
<value> <string>ERP5TypeTestCase</string> </value> <value> <string>zope</string> </value>
</item> </item>
<item> <item>
<key> <string>comment</string> </key> <key> <string>comment</string> </key>
...@@ -234,7 +240,7 @@ ...@@ -234,7 +240,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>965.45193.17797.6212</string> </value> <value> <string>972.24319.2093.21845</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -252,7 +258,7 @@ ...@@ -252,7 +258,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1519396467.53</float> <float>1545068659.12</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -100,7 +100,8 @@ ...@@ -100,7 +100,8 @@
context.getUrlFor({command: 'display', options: {page: "slap_computer_list", editable: true}}), context.getUrlFor({command: 'display', options: {page: "slap_computer_list", editable: true}}),
context.getUrlFor({command: 'display', options: {page: "slap_network_list", editable: true}}), context.getUrlFor({command: 'display', options: {page: "slap_network_list", editable: true}}),
context.getUrlFor({command: 'display', options: {page: "slap_project_list", editable: true}}), context.getUrlFor({command: 'display', options: {page: "slap_project_list", editable: true}}),
context.getUrlFor({command: 'display', options: {page: "slap_person_view", editable: true}}) context.getUrlFor({command: 'display', options: {page: "slap_person_view", editable: true}}),
context.getUrlFor({command: 'display', options: {page: "slap_message_list", editable: true}})
]); ]);
}) })
.push(function (result_list) { .push(function (result_list) {
...@@ -117,7 +118,8 @@ ...@@ -117,7 +118,8 @@
"computer_href": result_list[6], "computer_href": result_list[6],
"computer_network_href": result_list[7], "computer_network_href": result_list[7],
"project_href": result_list[8], "project_href": result_list[8],
"person_href": result_list[9] "person_href": result_list[9],
"message_href": result_list[10]
}) })
); );
}) })
......
...@@ -227,7 +227,7 @@ ...@@ -227,7 +227,7 @@
</item> </item>
<item> <item>
<key> <string>actor</string> </key> <key> <string>actor</string> </key>
<value> <string>ERP5TypeTestCase</string> </value> <value> <string>zope</string> </value>
</item> </item>
<item> <item>
<key> <string>comment</string> </key> <key> <string>comment</string> </key>
...@@ -241,7 +241,7 @@ ...@@ -241,7 +241,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>966.41526.6603.40089</string> </value> <value> <string>969.30355.4749.17220</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -259,7 +259,7 @@ ...@@ -259,7 +259,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1522944680.15</float> <float>1544694357.87</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -101,6 +101,7 @@ ...@@ -101,6 +101,7 @@
<string>my_content_type</string> <string>my_content_type</string>
<string>my_destination</string> <string>my_destination</string>
<string>my_start_date</string>