Commit d3c39738 authored by Evren Kutar's avatar Evren Kutar

FIX issue items on rfix #5145 fixes GH-87 fixes zetaops/ulakbusGH-195

parent ceb5b67f
...@@ -265,8 +265,11 @@ angular.module('ulakbus.crud', ['schemaForm', 'ulakbus.formService']) ...@@ -265,8 +265,11 @@ angular.module('ulakbus.crud', ['schemaForm', 'ulakbus.formService'])
$scope.reload({}); $scope.reload({});
}; };
$scope.resetCmd = function () { $scope.resetCmd = function () {
var pageData = Generator.getPageData();
CrudUtility.generateParam($scope, pageData, $routeParams.cmd);
delete $scope.token; delete $scope.token;
$scope.cmd = 'reset'; delete $scope.filters;
delete $scope.cmd;
Generator.get_wf($scope); Generator.get_wf($scope);
}; };
...@@ -353,6 +356,7 @@ angular.module('ulakbus.crud', ['schemaForm', 'ulakbus.formService']) ...@@ -353,6 +356,7 @@ angular.module('ulakbus.crud', ['schemaForm', 'ulakbus.formService'])
replace: true, replace: true,
link: function ($scope) { link: function ($scope) {
$scope.form_params.filters = $scope.form_params.filters || {}; $scope.form_params.filters = $scope.form_params.filters || {};
$scope.form_params.token = $scope.token;
$scope.filterList = {}; $scope.filterList = {};
$scope.filterCollapsed = {}; $scope.filterCollapsed = {};
$scope.$watch('list_filters', function () { $scope.$watch('list_filters', function () {
......
<div class="clearfix" ng-class="{'form-container': !objects || grouping.length < 1 }"> <div class="clearfix" ng-class="{'form-container': !objects}">
<div class="buttons-on-top"></div> <div class="buttons-on-top"></div>
<form id="formgenerated" name="formgenerated" sf-schema="schema" sf-form="form" sf-model="model" <form id="formgenerated" name="formgenerated" sf-schema="schema" sf-form="form" sf-model="model"
......
...@@ -860,10 +860,10 @@ angular.module('ulakbus.formService', ['ui.bootstrap']) ...@@ -860,10 +860,10 @@ angular.module('ulakbus.formService', ['ui.bootstrap'])
* @param {Object} data * @param {Object} data
*/ */
generator.pathDecider = function (client_cmd, $scope, data) { generator.pathDecider = function (client_cmd, $scope, data) {
if (client_cmd[0] === 'reload' || client_cmd[0] === 'reset') { //if (client_cmd[0] === 'reload' || client_cmd[0] === 'reset') {
$rootScope.$broadcast('reload_cmd', $scope.reload_cmd); // $rootScope.$broadcast('reload_cmd', $scope.reload_cmd);
return; // //return;
} //}
/** /**
* @memberof ulakbus.formService * @memberof ulakbus.formService
* @ngdoc function * @ngdoc function
......
This diff is collapsed.
...@@ -119,7 +119,7 @@ angular.module("components/crud/templates/filter.html", []).run(["$templateCache ...@@ -119,7 +119,7 @@ angular.module("components/crud/templates/filter.html", []).run(["$templateCache
angular.module("components/crud/templates/form.html", []).run(["$templateCache", function($templateCache) { angular.module("components/crud/templates/form.html", []).run(["$templateCache", function($templateCache) {
$templateCache.put("components/crud/templates/form.html", $templateCache.put("components/crud/templates/form.html",
"<div class=\"clearfix\" ng-class=\"{'form-container': !objects || grouping.length < 1 }\">\n" + "<div class=\"clearfix\" ng-class=\"{'form-container': !objects}\">\n" +
" <div class=\"buttons-on-top\"></div>\n" + " <div class=\"buttons-on-top\"></div>\n" +
"\n" + "\n" +
" <form id=\"formgenerated\" name=\"formgenerated\" sf-schema=\"schema\" sf-form=\"form\" sf-model=\"model\"\n" + " <form id=\"formgenerated\" name=\"formgenerated\" sf-schema=\"schema\" sf-form=\"form\" sf-model=\"model\"\n" +
......
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