Commit 45fe0b12 authored by Sven Franck's avatar Sven Franck

app: allow dynamic data inside a list of children

parent 755a962a
...@@ -4061,7 +4061,8 @@ ...@@ -4061,7 +4061,8 @@
storage.fetchConfigAttachment = function (obj) { storage.fetchConfigAttachment = function (obj) {
var reply, store; var reply, store;
if (obj.pass && obj.pass.skip) { // NOTE: obj.pass is undefined for storage etc > add pass = {}
if (obj.pass && (obj.pass.skip || obj.pass.no_config)) {
return RSVP.resolve({"pass": obj.pass}); return RSVP.resolve({"pass": obj.pass});
} }
...@@ -5773,10 +5774,9 @@ ...@@ -5773,10 +5774,9 @@
"purge": purge "purge": purge
}; };
// flag static data // flag static content and skip loading config
if (!content_dict.portal_type_source && !pass.url_dict.href) { pass.skip = !pass.url_dict.href && !pass.content_dict.portal_type_source;
pass.skip = true; pass.no_config = pass.skip || !!pass.content_dict.portal_type_source;
}
// and go // and go
return storage.fetchConfigAttachment({ return storage.fetchConfigAttachment({
...@@ -5809,7 +5809,8 @@ ...@@ -5809,7 +5809,8 @@
if (!pass.skip) { if (!pass.skip) {
// (dynamic element) config_dict // (dynamic element) config_dict
pass.config_dict = util.parse(reply.response); pass.config_dict = util.parse(reply.response) || pass.content_dict;
delete pass.no_config;
// test for auth based access // test for auth based access
pass.grant = true; pass.grant = true;
...@@ -5818,7 +5819,6 @@ ...@@ -5818,7 +5819,6 @@
if ((pass.grant || pass.mode === "new") && if ((pass.grant || pass.mode === "new") &&
pass.config_dict.portal_type_fields pass.config_dict.portal_type_fields
) { ) {
app.util.loader("", "status_dict.loading_config"); app.util.loader("", "status_dict.loading_config");
return storage.fetchConfigAttachment({ return storage.fetchConfigAttachment({
"storage": app.storage_dict.settings, "storage": app.storage_dict.settings,
......
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