Commit b75c54c4 authored by Evren Kutar's avatar Evren Kutar

resolves #56

resolves #57
parent 48409879
...@@ -240,7 +240,7 @@ angular.module('formService', ['ui.bootstrap']) ...@@ -240,7 +240,7 @@ angular.module('formService', ['ui.bootstrap'])
if (v.type === 'model') { if (v.type === 'model') {
var formitem = scope.form[scope.form.indexOf(k)]; var formitem = scope.form[scope.form.indexOf(k)];
var modelScope = {"url": v.wf, "form_params": {model: v.model_name, cmd: v.list_cmd}}; var modelScope = {"url": v.wf, "wf": v.wf, "form_params": {model: v.model_name, cmd: v.list_cmd}};
//scope.$on('refreshTitleMap', function (event, data) { //scope.$on('refreshTitleMap', function (event, data) {
// todo: write a function to refresh titleMap after new item add to linkedModel // todo: write a function to refresh titleMap after new item add to linkedModel
...@@ -304,7 +304,7 @@ angular.module('formService', ['ui.bootstrap']) ...@@ -304,7 +304,7 @@ angular.module('formService', ['ui.bootstrap'])
if ((v.type === 'ListNode' || v.type === 'Node') && v.widget === 'filter_interface') { if ((v.type === 'ListNode' || v.type === 'Node') && v.widget === 'filter_interface') {
var formitem = scope.form[scope.form.indexOf(k)]; var formitem = scope.form[scope.form.indexOf(k)];
var modelScope = { var modelScope = {
"url": v.wf || scope.wf, "url": v.wf || scope.wf, "wf": v.wf || scope.wf,
"form_params": {model: v.model_name || v.schema[0].model_name, cmd: v.list_cmd || 'select_list'} "form_params": {model: v.model_name || v.schema[0].model_name, cmd: v.list_cmd || 'select_list'}
}; };
...@@ -407,7 +407,8 @@ angular.module('formService', ['ui.bootstrap']) ...@@ -407,7 +407,8 @@ angular.module('formService', ['ui.bootstrap'])
formType: v.type, formType: v.type,
model_name: k model_name: k
}, },
url: scope.url url: scope.url,
wf: scope.wf
}); });
if (v.type === 'ListNode') { if (v.type === 'ListNode') {
...@@ -811,6 +812,7 @@ angular.module('formService', ['ui.bootstrap']) ...@@ -811,6 +812,7 @@ angular.module('formService', ['ui.bootstrap'])
}); });
var newscope = { var newscope = {
wf: scope.node.wf,
url: scope.node.url, url: scope.node.url,
form_params: {model: scope.node.schema.model_name}, form_params: {model: scope.node.schema.model_name},
edit: attribs[3] edit: attribs[3]
...@@ -851,7 +853,9 @@ angular.module('formService', ['ui.bootstrap']) ...@@ -851,7 +853,9 @@ angular.module('formService', ['ui.bootstrap'])
listNodeItem.model[childmodel.edit] = childmodel.model; listNodeItem.model[childmodel.edit] = childmodel.model;
} else { } else {
listNodeItem.model.push(angular.copy(childmodel.model)); listNodeItem.model.push(angular.copy(childmodel.model));
listNodeItem.items.push(reformattedModel); if (reformattedModel !== {}) {
listNodeItem.items.push(reformattedModel);
}
} }
listNodeItem.lengthModels += 1; listNodeItem.lengthModels += 1;
} }
...@@ -886,6 +890,7 @@ angular.module('formService', ['ui.bootstrap']) ...@@ -886,6 +890,7 @@ angular.module('formService', ['ui.bootstrap'])
var formName = attributes.addModalForLinkedModel; var formName = attributes.addModalForLinkedModel;
return Generator.get_form({ return Generator.get_form({
url: scope.form.wf, url: scope.form.wf,
wf: scope.form.wf,
form_params: {model: scope.form.model_name, cmd: scope.form.add_cmd}, form_params: {model: scope.form.model_name, cmd: scope.form.add_cmd},
modalElements: { modalElements: {
// define button position properties // define button position properties
......
This diff is collapsed.
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