Commit ef6ca76d authored by Alain Takoudjou's avatar Alain Takoudjou

[erp5_officejs] Add monitor to application list, fix export of file when name contain 'http'

parent 041bd35c
...@@ -45,6 +45,7 @@ ...@@ -45,6 +45,7 @@
<option>Web Table Editor</option> <option>Web Table Editor</option>
<option>Image Editor</option> <option>Image Editor</option>
<option>Awesome Free Software Publisher List</option> <option>Awesome Free Software Publisher List</option>
<option>Monitoring App</option>
<option>Todomvc</option> <option>Todomvc</option>
<option>App Store</option> <option>App Store</option>
</select> </select>
......
...@@ -231,7 +231,7 @@ ...@@ -231,7 +231,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>961.47852.14013.52787</string> </value> <value> <string>961.61082.37614.3396</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -249,7 +249,7 @@ ...@@ -249,7 +249,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1504000114.75</float> <float>1504856534.31</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -75,6 +75,11 @@ ...@@ -75,6 +75,11 @@
"no_installer": true, "no_installer": true,
"sub_gadget": ["connection"] "sub_gadget": ["connection"]
}, },
"Monitoring App": {
"url": "monitoring_render_js/",
"cache" : "gadget_monitoring.appcache",
"sub_gadget": []
},
"App Store": { "App Store": {
"url": "officejsoldv1/", "url": "officejsoldv1/",
"cache": "officejs_store.appcache", "cache": "officejs_store.appcache",
......
...@@ -227,7 +227,7 @@ ...@@ -227,7 +227,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>961.47860.26994.26982</string> </value> <value> <string>961.62121.21824.18124</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -245,7 +245,7 @@ ...@@ -245,7 +245,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1504000609.36</float> <float>1504856376.66</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -59,7 +59,6 @@ ...@@ -59,7 +59,6 @@
filename = id.substring(last_index); filename = id.substring(last_index);
} }
} }
if (!id.includes("http")) {
if (path.charAt(0) !== '/') { if (path.charAt(0) !== '/') {
path = '/' + path; path = '/' + path;
} }
...@@ -68,7 +67,6 @@ ...@@ -68,7 +67,6 @@
} }
context._id_dict[path][filename] = {}; context._id_dict[path][filename] = {};
} }
}
}); });
}; };
......
...@@ -239,7 +239,7 @@ ...@@ -239,7 +239,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>960.14254.57744.3293</string> </value> <value> <string>961.61072.50119.43246</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -257,7 +257,7 @@ ...@@ -257,7 +257,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1498139828.83</float> <float>1504857724.83</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </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