Commit 2742b23c authored by Evren Kutar's avatar Evren Kutar

reload function reuse

linkedmodel wf add_cmd list_cmd attributes
parent dc7c64f9
...@@ -182,24 +182,13 @@ angular.module('ulakbus.crud', ['ui.bootstrap', 'schemaForm', 'formService']) ...@@ -182,24 +182,13 @@ angular.module('ulakbus.crud', ['ui.bootstrap', 'schemaForm', 'formService'])
Generator.doItemAction($scope, key, cmd); Generator.doItemAction($scope, key, cmd);
}; };
$scope.pagination = {page:1, total_pages:8};
$scope.getNumber = function (num) { $scope.getNumber = function (num) {
return new Array(num); return new Array(num);
}; };
// reloadData must be a json object
$scope.reload = function (reloadData) {
$scope.form_params.cmd = $scope.reload_cmd;
$scope.form_params = angular.extend($scope.form_params, reloadData);
$log.debug('reload data', $scope);
Generator.get_wf($scope);
};
} }
if ($routeParams.cmd === 'reload') { if ($routeParams.cmd === 'reload') {
$scope.cmd = 'reload'; $scope.reload({});
Generator.get_wf($scope);
} }
if ($routeParams.cmd === 'reset') { if ($routeParams.cmd === 'reset') {
...@@ -207,6 +196,14 @@ angular.module('ulakbus.crud', ['ui.bootstrap', 'schemaForm', 'formService']) ...@@ -207,6 +196,14 @@ angular.module('ulakbus.crud', ['ui.bootstrap', 'schemaForm', 'formService'])
$scope.cmd = 'reset'; $scope.cmd = 'reset';
Generator.get_wf($scope); Generator.get_wf($scope);
} }
// reloadData must be a json object
$scope.reload = function (reloadData) {
$scope.form_params.cmd = $scope.reload_cmd;
$scope.form_params = angular.extend($scope.form_params, reloadData);
$log.debug('reload data', $scope);
Generator.get_wf($scope);
};
}) })
.directive('crudListDirective', function () { .directive('crudListDirective', function () {
......
...@@ -197,12 +197,14 @@ angular.module('formService', []) ...@@ -197,12 +197,14 @@ angular.module('formService', [])
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": scope.url, "form_params": {model: v.model_name}}; var modelscope = {"url": v.wf, "form_params": {model: v.model_name, cmd: v.list_cmd}};
formitem = { formitem = {
type: "template", type: "template",
templateUrl: "shared/templates/foreignKey.html", templateUrl: "shared/templates/foreignKey.html",
title: v.title, title: v.title,
wf: v.wf,
add_cmd: v.add_cmd,
name: v.model_name, name: v.model_name,
model_name: v.model_name, model_name: v.model_name,
titleMap: generator.get_list(modelscope).then(function (res) { titleMap: generator.get_list(modelscope).then(function (res) {
...@@ -597,15 +599,15 @@ angular.module('formService', []) ...@@ -597,15 +599,15 @@ angular.module('formService', [])
resolve: { resolve: {
items: function () { items: function () {
return Generator.get_form({ return Generator.get_form({
url: 'crud', url: scope.form.wf,
form_params: {'model': scope.form.model_name, "cmd": "form"} form_params: {model: scope.form.model_name, cmd: scope.form.add_cmd}
}); });
} }
} }
}); });
modalInstance.result.then(function (childmodel, key) { modalInstance.result.then(function (childscope, key) {
Generator.submit(childmodel); Generator.submit(childscope);
$route.reload(); $route.reload();
}); });
}); });
......
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