Commit a6c1ef1a authored by Boxiang Sun's avatar Boxiang Sun Committed by Rafael Monnerat

slapos_jio: Force user to login if they don't have a correct setting

parent 5f58b930
......@@ -9,6 +9,7 @@
<script src="rsvp.js"></script>
<script src="renderjs.js"></script>
<script src="gadget_slapos_utils.js" type="text/javascript"></script>
<script src="gadget_erp5_page_slap_add_related_ticket.js"></script>
</head>
......
......@@ -245,6 +245,7 @@
</item>
</dictionary>
</list>
<none/>
</tuple>
</pickle>
</record>
......@@ -277,7 +278,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>962.64746.4978.20753</string> </value>
<value> <string>980.6873.14525.36027</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -295,7 +296,7 @@
</tuple>
<state>
<tuple>
<float>1508859502.98</float>
<float>1575974033.34</float>
<string>UTC</string>
</tuple>
</state>
......@@ -304,6 +305,7 @@
</item>
</dictionary>
</list>
<none/>
</tuple>
</pickle>
</record>
......@@ -361,6 +363,7 @@
</item>
</dictionary>
</list>
<none/>
</tuple>
</pickle>
</record>
......
......@@ -74,7 +74,7 @@
gadget.getDeclaredGadget('form_view'),
gadget.jio_getAttachment("ticket_resource_list",
hateoas_url + "Ticket_getResourceItemListAsJSON"),
gadget.getSetting("me")
window.getSettingMe(gadget)
]);
})
.push(function (result) {
......
......@@ -241,6 +241,7 @@
</item>
</dictionary>
</list>
<none/>
</tuple>
</pickle>
</record>
......@@ -273,7 +274,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>972.32024.53732.34406</string> </value>
<value> <string>980.6873.14525.36027</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -291,7 +292,7 @@
</tuple>
<state>
<tuple>
<float>1545996475.08</float>
<float>1575020732.67</float>
<string>UTC</string>
</tuple>
</state>
......@@ -300,6 +301,7 @@
</item>
</dictionary>
</list>
<none/>
</tuple>
</pickle>
</record>
......@@ -357,6 +359,7 @@
</item>
</dictionary>
</list>
<none/>
</tuple>
</pickle>
</record>
......
......@@ -9,6 +9,7 @@
<script src="rsvp.js"></script>
<script src="renderjs.js"></script>
<script src="gadget_slapos_utils.js" type="text/javascript"></script>
<script src="gadget_erp5_page_slap_add_ticket.js"></script>
</head>
......
......@@ -245,6 +245,7 @@
</item>
</dictionary>
</list>
<none/>
</tuple>
</pickle>
</record>
......@@ -277,7 +278,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>962.58969.5978.58811</string> </value>
<value> <string>980.6931.21812.22596</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -295,7 +296,7 @@
</tuple>
<state>
<tuple>
<float>1508512913.95</float>
<float>1574960470.43</float>
<string>UTC</string>
</tuple>
</state>
......@@ -304,6 +305,7 @@
</item>
</dictionary>
</list>
<none/>
</tuple>
</pickle>
</record>
......@@ -361,6 +363,7 @@
</item>
</dictionary>
</list>
<none/>
</tuple>
</pickle>
</record>
......
......@@ -13,6 +13,7 @@
.declareAcquiredMethod("getUrlFor", "getUrlFor")
.declareAcquiredMethod("redirect", "redirect")
.declareAcquiredMethod("jio_post", "jio_post")
.declareAcquiredMethod("jio_get", "jio_get")
.declareAcquiredMethod("notifySubmitting", "notifySubmitting")
.declareAcquiredMethod("notifySubmitted", 'notifySubmitted')
......@@ -71,7 +72,7 @@
gadget.getDeclaredGadget('form_view'),
gadget.jio_getAttachment("ticket_resource_list",
hateoas_url + "Ticket_getResourceItemListAsJSON"),
gadget.getSetting("me")
window.getSettingMe(gadget)
]);
})
.push(function (result) {
......
......@@ -241,6 +241,7 @@
</item>
</dictionary>
</list>
<none/>
</tuple>
</pickle>
</record>
......@@ -273,7 +274,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>963.7798.59652.54613</string> </value>
<value> <string>980.7928.37162.44441</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -291,7 +292,7 @@
</tuple>
<state>
<tuple>
<float>1509374910.39</float>
<float>1576228705.95</float>
<string>UTC</string>
</tuple>
</state>
......@@ -300,6 +301,7 @@
</item>
</dictionary>
</list>
<none/>
</tuple>
</pickle>
</record>
......@@ -357,6 +359,7 @@
</item>
</dictionary>
</list>
<none/>
</tuple>
</pickle>
</record>
......
......@@ -13,6 +13,7 @@
<script src="renderjs.js" type="text/javascript"></script>
<!-- custom script -->
<script src="gadget_slapos_utils.js" type="text/javascript"></script>
<script src="gadget_erp5_page_slap_person_view.js" type="text/javascript"></script>
</head>
......
......@@ -202,6 +202,7 @@
</item>
</dictionary>
</list>
<none/>
</tuple>
</pickle>
</record>
......@@ -234,7 +235,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>962.58641.23625.32170</string> </value>
<value> <string>980.6873.14525.36027</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -252,7 +253,7 @@
</tuple>
<state>
<tuple>
<float>1508500260.41</float>
<float>1574960455.23</float>
<string>UTC</string>
</tuple>
</state>
......@@ -261,6 +262,7 @@
</item>
</dictionary>
</list>
<none/>
</tuple>
</pickle>
</record>
......@@ -318,6 +320,7 @@
</item>
</dictionary>
</list>
<none/>
</tuple>
</pickle>
</record>
......
......@@ -10,6 +10,7 @@
.declareAcquiredMethod("updateHeader", "updateHeader")
.declareAcquiredMethod("getUrlParameter", "getUrlParameter")
.declareAcquiredMethod("getUrlFor", "getUrlFor")
.declareAcquiredMethod("redirect", "redirect")
.declareAcquiredMethod("jio_get", "jio_get")
.declareAcquiredMethod("getSetting", "getSetting")
.declareAcquiredMethod("updateDocument", "updateDocument")
......@@ -45,7 +46,7 @@
return new RSVP.Queue()
.push(function () {
return gadget.getSetting("me");
return window.getSettingMe(gadget);
})
.push(function (me) {
jio_key = me;
......@@ -206,7 +207,7 @@
});
})
.push(function () {
return gadget.getSetting("me");
return window.getSettingMe(gadget);
})
.push(function (me) {
return RSVP.all([
......
......@@ -209,6 +209,7 @@
</item>
</dictionary>
</list>
<none/>
</tuple>
</pickle>
</record>
......@@ -241,7 +242,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>976.40553.2729.56763</string> </value>
<value> <string>980.7943.45013.43144</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -259,7 +260,7 @@
</tuple>
<state>
<tuple>
<float>1561422636.38</float>
<float>1575023357.88</float>
<string>UTC</string>
</tuple>
</state>
......@@ -268,6 +269,7 @@
</item>
</dictionary>
</list>
<none/>
</tuple>
</pickle>
</record>
......@@ -325,6 +327,7 @@
</item>
</dictionary>
</list>
<none/>
</tuple>
</pickle>
</record>
......
......@@ -13,6 +13,7 @@
<script src="renderjs.js" type="text/javascript"></script>
<!-- custom script -->
<script src="gadget_slapos_utils.js" type="text/javascript"></script>
<script src="gadget_erp5_page_slap_project_list.js" type="text/javascript"></script>
</head>
......
......@@ -202,6 +202,7 @@
</item>
</dictionary>
</list>
<none/>
</tuple>
</pickle>
</record>
......@@ -234,7 +235,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>962.57392.25775.12868</string> </value>
<value> <string>980.25270.11198.51746</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -252,7 +253,7 @@
</tuple>
<state>
<tuple>
<float>1508418276.01</float>
<float>1575973846.43</float>
<string>UTC</string>
</tuple>
</state>
......@@ -261,6 +262,7 @@
</item>
</dictionary>
</list>
<none/>
</tuple>
</pickle>
</record>
......@@ -318,6 +320,7 @@
</item>
</dictionary>
</list>
<none/>
</tuple>
</pickle>
</record>
......
......@@ -12,6 +12,7 @@
.declareAcquiredMethod("jio_get", "jio_get")
.declareAcquiredMethod("getUrlFor", "getUrlFor")
.declareAcquiredMethod("jio_allDocs", "jio_allDocs")
.declareAcquiredMethod("jio_getAttachment", "jio_getAttachment")
.allowPublicAcquisition("jio_allDocs", function (param_list) {
var gadget = this;
......@@ -62,7 +63,7 @@
.push(function () {
return RSVP.all([
gadget.getSetting("listbox_lines_limit", 20),
gadget.getSetting("me")
window.getSettingMe(gadget)
]);
})
.push(function (settings) {
......
......@@ -198,6 +198,7 @@
</item>
</dictionary>
</list>
<none/>
</tuple>
</pickle>
</record>
......@@ -216,7 +217,7 @@
</item>
<item>
<key> <string>actor</string> </key>
<value> <string>superrafael</string> </value>
<value> <string>zope</string> </value>
</item>
<item>
<key> <string>comment</string> </key>
......@@ -230,7 +231,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>974.61500.28585.34065</string> </value>
<value> <string>980.7946.28171.30583</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -248,7 +249,7 @@
</tuple>
<state>
<tuple>
<float>1554901016.21</float>
<float>1575020906.65</float>
<string>UTC</string>
</tuple>
</state>
......@@ -257,6 +258,7 @@
</item>
</dictionary>
</list>
<none/>
</tuple>
</pickle>
</record>
......@@ -314,6 +316,7 @@
</item>
</dictionary>
</list>
<none/>
</tuple>
</pickle>
</record>
......
......@@ -13,6 +13,7 @@
<script src="renderjs.js" type="text/javascript"></script>
<!-- custom script -->
<script src="gadget_slapos_utils.js" type="text/javascript"></script>
<script src="gadget_erp5_page_slap_site_list.js" type="text/javascript"></script>
</head>
......
......@@ -202,6 +202,7 @@
</item>
</dictionary>
</list>
<none/>
</tuple>
</pickle>
</record>
......@@ -234,7 +235,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>962.56743.21060.60706</string> </value>
<value> <string>980.6873.14525.36027</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -252,7 +253,7 @@
</tuple>
<state>
<tuple>
<float>1508379341.42</float>
<float>1575974102.28</float>
<string>UTC</string>
</tuple>
</state>
......@@ -261,6 +262,7 @@
</item>
</dictionary>
</list>
<none/>
</tuple>
</pickle>
</record>
......@@ -318,6 +320,7 @@
</item>
</dictionary>
</list>
<none/>
</tuple>
</pickle>
</record>
......
......@@ -12,6 +12,7 @@
.declareAcquiredMethod("jio_get", "jio_get")
.declareAcquiredMethod("getUrlFor", "getUrlFor")
.declareAcquiredMethod("jio_allDocs", "jio_allDocs")
.declareAcquiredMethod("jio_getAttachment", "jio_getAttachment")
.allowPublicAcquisition("jio_allDocs", function (param_list) {
var gadget = this;
......@@ -62,7 +63,7 @@
.push(function () {
return RSVP.all([
gadget.getSetting("listbox_lines_limit", 20),
gadget.getSetting("me")
window.getSettingMe(gadget)
]);
})
.push(function (settings) {
......
......@@ -198,6 +198,7 @@
</item>
</dictionary>
</list>
<none/>
</tuple>
</pickle>
</record>
......@@ -230,7 +231,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>974.61497.27931.35481</string> </value>
<value> <string>980.6873.14525.36027</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -248,7 +249,7 @@
</tuple>
<state>
<tuple>
<float>1554900905.51</float>
<float>1575020879.49</float>
<string>UTC</string>
</tuple>
</state>
......@@ -257,6 +258,7 @@
</item>
</dictionary>
</list>
<none/>
</tuple>
</pickle>
</record>
......@@ -314,6 +316,7 @@
</item>
</dictionary>
</list>
<none/>
</tuple>
</pickle>
</record>
......
......@@ -13,6 +13,7 @@
<script src="renderjs.js" type="text/javascript"></script>
<!-- custom script -->
<script src="gadget_slapos_utils.js" type="text/javascript"></script>
<script src="gadget_erp5_page_slap_ticket_list.js" type="text/javascript"></script>
</head>
......
......@@ -202,6 +202,7 @@
</item>
</dictionary>
</list>
<none/>
</tuple>
</pickle>
</record>
......@@ -234,7 +235,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>962.57056.15979.37768</string> </value>
<value> <string>980.6925.1989.65006</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -252,7 +253,7 @@
</tuple>
<state>
<tuple>
<float>1508400946.22</float>
<float>1574960436.86</float>
<string>UTC</string>
</tuple>
</state>
......@@ -261,6 +262,7 @@
</item>
</dictionary>
</list>
<none/>
</tuple>
</pickle>
</record>
......@@ -318,6 +320,7 @@
</item>
</dictionary>
</list>
<none/>
</tuple>
</pickle>
</record>
......
......@@ -13,6 +13,7 @@
.declareAcquiredMethod("getUrlFor", "getUrlFor")
.declareAcquiredMethod("jio_allDocs", "jio_allDocs")
.declareAcquiredMethod("jio_get", "jio_get")
.declareAcquiredMethod("jio_getAttachment", "jio_getAttachment")
/////////////////////////////////////////////////////////////////
......@@ -33,7 +34,7 @@
.push(function () {
return RSVP.all([
gadget.getSetting("listbox_lines_limit", 20),
gadget.getSetting("me")
window.getSettingMe(gadget)
]);
})
.push(function (setting) {
......
......@@ -198,6 +198,7 @@
</item>
</dictionary>
</list>
<none/>
</tuple>
</pickle>
</record>
......@@ -230,7 +231,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>974.61510.55768.19899</string> </value>
<value> <string>980.7933.50073.58436</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -248,7 +249,7 @@
</tuple>
<state>
<tuple>
<float>1554901834.87</float>
<float>1575023625.93</float>
<string>UTC</string>
</tuple>
</state>
......@@ -257,6 +258,7 @@
</item>
</dictionary>
</list>
<none/>
</tuple>
</pickle>
</record>
......@@ -314,6 +316,7 @@
</item>
</dictionary>
</list>
<none/>
</tuple>
</pickle>
</record>
......
......@@ -9,6 +9,7 @@
<script src="rsvp.js"></script>
<script src="renderjs.js"></script>
<script src="gadget_slapos_utils.js" type="text/javascript"></script>
<script src="gadget_erp5_page_slap_transfer_computer.js"></script>
</head>
......
......@@ -245,6 +245,7 @@
</item>
</dictionary>
</list>
<none/>
</tuple>
</pickle>
</record>
......@@ -277,7 +278,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>964.5710.48275.44561</string> </value>
<value> <string>980.6873.14525.36027</string> </value>