Commit 1f0ea231 authored by Sven Franck's avatar Sven Franck

app: cleanup

parent bbfcacd7
...@@ -6135,12 +6135,8 @@ ...@@ -6135,12 +6135,8 @@
return RSVP.all(promise_list) return RSVP.all(promise_list)
.then(function (response_list) { .then(function (response_list) {
if (!response_list[0]) { if (!response_list[0] && promise_list.length !== 0) {
app.util.loader( app.util.loader("", "status_dict.internal_error", "ban");
"",
"status_dict.internal_error",
"ban-circle"
);
} }
// just return pass and continue // just return pass and continue
return { return {
...@@ -6926,11 +6922,11 @@ ...@@ -6926,11 +6922,11 @@
// set values or flag for subordination inside map.element // set values or flag for subordination inside map.element
default: default:
kid.logic[key] = kid.logic[key] || ""; kid.logic[key] = kid.logic[key] || "";
if (val.split("subordinate_").length > 1) { if (val.split("subordinate_").length > 1) {
// NOTE: try to get value from state/URL before flagging // NOTE: try to get value from state/URL before flagging
// NOTE: must check for equality, otherwise id foo > foofoo // NOTE: must check for equality, otherwise id foo > foofoo
// TODO: this is still super-not-robust... redo!
lookup = wrapper.property_dict.state.query.query; lookup = wrapper.property_dict.state.query.query;
if (lookup && lookup.indexOf(val) > -1) { if (lookup && lookup.indexOf(val) > -1) {
new_val = lookup.split(val)[1].split("+")[0] new_val = lookup.split(val)[1].split("+")[0]
...@@ -6943,9 +6939,6 @@ ...@@ -6943,9 +6939,6 @@
} }
} else { } else {
kid.logic[key] += wrapper.property_dict.data.doc[val]; kid.logic[key] += wrapper.property_dict.data.doc[val];
// if (key === "href") {
// kid.logic[key] = window.encodeURIComponent(kid.logic[key]);
// }
delete kid.logic.setParam[i]; delete kid.logic.setParam[i];
} }
} }
......
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