Commit cf64f37d authored by Boris Kocherov's avatar Boris Kocherov

erp5_officejs: support multiple versions has been added in application installer

parent f26f409c
...@@ -14,6 +14,21 @@ var repair = false; ...@@ -14,6 +14,21 @@ var repair = false;
}); });
function createStorage(version) { function createStorage(version) {
var i,
version_list,
version_query;
if (version.indexOf(",") !== -1) {
version_list = version.split(',');
version_query = [];
for (i = 1; i < version_list.length; i += 1) {
version_query.push('"' + version_list[i] + '"');
}
version_query.join(',');
version_query = '(version: "' + version_list[0] +
'" OR ((NOT url_string: "/") AND (version: (' + version_query + '))))';
} else {
version_query = 'version: "' + version + '"';
}
return jIO.createJIO({ return jIO.createJIO({
type: "replicate", type: "replicate",
conflict_handling: 2, conflict_handling: 2,
...@@ -25,7 +40,7 @@ var repair = false; ...@@ -25,7 +40,7 @@ var repair = false;
query: { query: {
query: 'portal_type: ("Web Illustration",' + query: 'portal_type: ("Web Illustration",' +
'"Web Manifest","Web Script","Web Style","Web Page")' + '"Web Manifest","Web Script","Web Style","Web Page")' +
'AND version:"' + version + '"', 'AND ' + version_query,
"limit": [0, 27131], "limit": [0, 27131],
"select_list": ["url_string"] "select_list": ["url_string"]
}, },
...@@ -237,7 +252,7 @@ var repair = false; ...@@ -237,7 +252,7 @@ var repair = false;
url_list[i] !== "" && url_list[i] !== "" &&
url_list[i].charAt(0) !== '#' && url_list[i].charAt(0) !== '#' &&
url_list[i].charAt(0) !== ' ') { url_list[i].charAt(0) !== ' ') {
url_list[i].replace("\r",""); url_list[i].replace("\r", "");
gadget.props.cached_url.push(url_list[i]); gadget.props.cached_url.push(url_list[i]);
} }
if (url_list[i].indexOf("CACHE:") >= 0) { if (url_list[i].indexOf("CACHE:") >= 0) {
......
...@@ -222,7 +222,7 @@ ...@@ -222,7 +222,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>956.5849.44474.42086</string> </value> <value> <string>956.26444.19522.39458</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -240,7 +240,7 @@ ...@@ -240,7 +240,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1482259856.41</float> <float>1483486820.92</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