Commit 24b9e1e7 authored by Sven Franck's avatar Sven Franck

fixed naming conflict in release install by prefixing form id & name

parent 44568959
...@@ -1073,18 +1073,6 @@ ...@@ -1073,18 +1073,6 @@
storage.add(obj); storage.add(obj);
}, },
/**
* add a service
* @method install
* @param {object} obj Action Object
**/
"instantiate": function (obj) {
obj.gadget.state.create_new = true;
obj.gadget.state.force_formdata = true;
obj.gadget.state.url_pointer = "request";
storage.add(obj);
},
/** /**
* Add a user to the storage * Add a user to the storage
* @method submit * @method submit
...@@ -3761,7 +3749,7 @@ ...@@ -3761,7 +3749,7 @@
var i, j, k, l, m, n, segment, element, container, area, field, overrides, var i, j, k, l, m, n, segment, element, container, area, field, overrides,
position, doc, config, value, stamp, sauce, encode, secure, position, doc, config, value, stamp, sauce, encode, secure,
safety_box, fragment, wrap, item_id, input_config, setter, setter_list, safety_box, fragment, wrap, item_id, input_config, setter, setter_list,
button; button, prefixed_name;
spec.set_id = spec.reference; spec.set_id = spec.reference;
fragment = factory.util.wrapInForm(spec); fragment = factory.util.wrapInForm(spec);
...@@ -3872,9 +3860,10 @@ ...@@ -3872,9 +3860,10 @@
field = segment.fieldlist[j]; field = segment.fieldlist[j];
// allow non-fieldlist form elements to be generated // allow non-fieldlist form elements to be generated
// TODO: can we also generate a field from another portal_type here?
if (field.type) { if (field.type) {
input_config = field; input_config = field;
prefixed_name = spec.reference + "_" + field.direct.name || util.uuid();
field.direct.id = field.direct.name = prefixed_name;
setter = input_config.logic ? (input_config.logic.setValue || input_config.logic.setFlux) : undefined; setter = input_config.logic ? (input_config.logic.setValue || input_config.logic.setFlux) : undefined;
// make sure value is set correctly // make sure value is set correctly
...@@ -7077,7 +7066,7 @@ ...@@ -7077,7 +7066,7 @@
// pass.state.selected = pass.create === false ? // pass.state.selected = pass.create === false ?
// (pass.state.selected) : undefined; // (pass.state.selected) : undefined;
// if a callback is provided, set it on state // set callback and pointer on state
pass.state.callback = pass.config.property_dict.submit_to; pass.state.callback = pass.config.property_dict.submit_to;
pass.state.url_pointer = pass.config.property_dict.url_pointer; pass.state.url_pointer = pass.config.property_dict.url_pointer;
...@@ -7779,7 +7768,7 @@ ...@@ -7779,7 +7768,7 @@
// force sync // force sync
if (app.storage_dict.property_dict.force_sync) { if (app.storage_dict.property_dict.force_sync) {
storage.sync(mapped, parcel.storage); //storage.sync(mapped, parcel.storage);
} }
return { return {
......
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