Commit 1fee4f9a by Boris Kocherov

[erp5_only_office] sync with new version rjs_schema_form

1 parent 9e06df17
......@@ -23,19 +23,7 @@
}
function get_used_dimensions(g) {
var q;
if (g.props.init_value) {
q = RSVP.Queue()
.push(function () {
return g.props.init_value;
});
} else {
q = g.getDeclaredGadget("olap_wizard")
.push(function (gadget) {
return gadget.getContent();
});
}
return q
return g.getContent()
.push(function (v) {
var dimensions = [],
key,
......@@ -109,7 +97,7 @@
}
queue = make_request(urls[0])();
for (i = 1; i < settings.urls.length; i += 1) {
for (i = 1; i < urls.length; i += 1) {
queue.push(undefined, make_request(urls[i]));
}
return queue;
......@@ -336,22 +324,12 @@
});
})
.declareMethod("render", function (opt) {
var g = this;
if (!opt) {
opt = {};
}
g.props.init_value = opt.value;
return get_used_dimensions(g)
.push(function (v) {
g.props.used_dimensions = v;
return g.getDeclaredGadget("olap_wizard");
})
return this.getDeclaredGadget("olap_wizard")
.push(function (gadget) {
return gadget.render(opt);
})
.push(function () {
delete g.props.init_value;
delete g.props.used_dimensions;
});
})
.declareMethod("getContent", function (path) {
......@@ -498,20 +476,21 @@
if ("urn:jio:choice.json" === url) {
return new RSVP.Queue()
.push(function () {
return g.getRemoteSettings();
return RSVP.all([
g.getRemoteSettings(),
g.getContent("/connection_name"),
g.getContent(path),
get_used_dimensions(g)
]);
})
.push(function (connections) {
.push(function (arr) {
var connection_settings,
choice_settings;
if (g.props.init_value) {
connection_settings =
connections[convertOnMultiLevel(g.props.init_value, "/connection_name")];
if (path !== "/columns/" && path !== "/rows/") {
choice_settings = convertOnMultiLevel(g.props.init_value, path);
}
return generateChoiceSchema(connection_settings, g.props.used_dimensions, choice_settings);
connection_settings = arr[0][arr[1]];
if (path !== "/columns/" && path !== "/rows/") {
choice_settings = arr[2];
}
return {};
return generateChoiceSchema(connection_settings, arr[3], choice_settings);
});
}
throw new Error("urn: '" + url + "' not supported");
......
......@@ -216,19 +216,15 @@
})
.declareMethod("render", function (opt) {
var gadget = this;
gadget.props.init_value = opt.value;
return gadget.getDeclaredGadget("xmla_settings")
.push(function (g) {
return g.render(opt);
})
.push(function () {
delete gadget.props.init_value;
});
})
.declareMethod("getContent", function () {
.declareMethod("getContent", function (sub_path) {
return this.getDeclaredGadget("xmla_settings")
.push(function (g) {
return g.getContent();
return g.getContent(sub_path);
});
})
.declareAcquiredMethod("notifyChange", "notifyChange")
......@@ -293,18 +289,13 @@
return g.notifyChange();
})
.allowPublicAcquisition("resolveExternalReference", function (arr) {
var g = this,
url = arr[0],
var url = arr[0],
schema_path = arr[1],
path = arr[2];
path = arr[2],
connection_path = path.split('/').slice(0, -1).join('/');
if ("urn:jio:properties_from_xmla.connection.json" === url) {
return new RSVP.Queue()
.push(function () {
var connection_path = path.split('/').slice(0, -1).join('/'),
settings;
if (g.props.init_value) {
settings = convertOnMultiLevel(g.props.init_value, connection_path);
}
return this.getContent(connection_path)
.push(function (settings) {
return generateSchema(settings);
});
}
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!