Skip to content

U
ulakbus-ui
Commit ceb5b67f authored by Evren Kutar's avatar Evren Kutar
Browse files
Options

FIX remove button disabler for system works properly until work done

parent aeb8c045
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 16 deletions
app/components/auth/auth_controller.js
View file @ ceb5b67f
...@@ -37,7 +37,7 @@ angular.module('ulakbus.auth', ['ngRoute', 'ngCookies']) ...@@ -37,7 +37,7 @@ angular.module('ulakbus.auth', ['ngRoute', 'ngCookies'])
]; ];
// to show page items showApp must be set to true // to show page items showApp must be set to true
// it prevents to show empty nonsense page items when http401/403 // it prevents to show empty nonsense page items when http401/403
$rootScope.showApp = true; //$rootScope.showApp = true;
}); });
$scope.loggingIn = false; $scope.loggingIn = false;
$scope.onSubmit = function (form) { $scope.onSubmit = function (form) {
...@@ -53,7 +53,7 @@ angular.module('ulakbus.auth', ['ngRoute', 'ngCookies']) ...@@ -53,7 +53,7 @@ angular.module('ulakbus.auth', ['ngRoute', 'ngCookies'])
}) })
.then(function () { .then(function () {
$scope.loggingIn = false; $scope.loggingIn = false;
Generator.button_switch(false); Generator.button_switch(true);
}) })
} }
else { else {
......
app/components/auth/auth_service.js
View file @ ceb5b67f
...@@ -35,7 +35,7 @@ angular.module('ulakbus.auth') ...@@ -35,7 +35,7 @@ angular.module('ulakbus.auth')
.post(RESTURL.url + url, credentials) .post(RESTURL.url + url, credentials)
.success(function (data, status, headers, config) { .success(function (data, status, headers, config) {
//$window.sessionStorage.token = data.token; //$window.sessionStorage.token = data.token;
Generator.button_switch(true);
$rootScope.loggedInUser = true; $rootScope.loggedInUser = true;
}) })
.error(function (data, status, headers, config) { .error(function (data, status, headers, config) {
......
app/index.html
View file @ ceb5b67f
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<link rel="stylesheet" href="bower_components/intro.js/themes/introjs-nassim.css" type="text/css"> <link rel="stylesheet" href="bower_components/intro.js/themes/introjs-nassim.css" type="text/css">
</head> </head>
<body ng-controller="KeyListenController" ng-keydown="down($event)" ng-show="$root.showApp"> <body ng-controller="KeyListenController" ng-keydown="down($event)">
<nav class="navbar navbar-default navbar-static-top" role="navigation" style="margin-bottom: 0" ng-if="$root.loggedInUser"> <nav class="navbar navbar-default navbar-static-top" role="navigation" style="margin-bottom: 0" ng-if="$root.loggedInUser">
<collapse-menu></collapse-menu> <collapse-menu></collapse-menu>
......
app/main.html
View file @ ceb5b67f
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
<link rel="stylesheet" href="css/jquery-ui.min.css"> <link rel="stylesheet" href="css/jquery-ui.min.css">
<!-- @endif --> <!-- @endif -->
</head> </head>
<body ng-controller="KeyListenController" ng-keydown="down($event)" ng-show="$root.showApp"> <body ng-controller="KeyListenController" ng-keydown="down($event)">
<nav class="navbar navbar-default navbar-static-top" role="navigation" style="margin-bottom: 0" ng-if="$root.loggedInUser"> <nav class="navbar navbar-default navbar-static-top" role="navigation" style="margin-bottom: 0" ng-if="$root.loggedInUser">
<collapse-menu></collapse-menu> <collapse-menu></collapse-menu>
......
app/shared/directives.js
View file @ ceb5b67f
...@@ -357,7 +357,7 @@ angular.module('ulakbus') ...@@ -357,7 +357,7 @@ angular.module('ulakbus')
sidebarmenu.metisMenu(); sidebarmenu.metisMenu();
// to show page items showApp must be set to true // to show page items showApp must be set to true
// it prevents to show empty nonsense page items when http401/403 // it prevents to show empty nonsense page items when http401/403
$rootScope.showApp = true; //$rootScope.showApp = true;
}); });
}); });
......
app/zetalib/form_service.js
View file @ ceb5b67f
...@@ -743,7 +743,7 @@ angular.module('ulakbus.formService', ['ui.bootstrap']) ...@@ -743,7 +743,7 @@ angular.module('ulakbus.formService', ['ui.bootstrap'])
button[positions[position]] = true; button[positions[position]] = true;
}); });
$log.debug('buttons >> ', positions[position]) $log.debug('buttons >> ', positions[position])
} };
/** /**
* @memberof ulakbus.formService * @memberof ulakbus.formService
* @ngdoc function * @ngdoc function
...@@ -753,11 +753,11 @@ angular.module('ulakbus.formService', ['ui.bootstrap']) ...@@ -753,11 +753,11 @@ angular.module('ulakbus.formService', ['ui.bootstrap'])
* @returns {*} * @returns {*}
*/ */
generator.get_form = function (scope) { generator.get_form = function (scope) {
generator.button_switch(false); //generator.button_switch(false);
return $http return $http
.post(generator.makeUrl(scope), scope.form_params) .post(generator.makeUrl(scope), scope.form_params)
.then(function (res) { .then(function (res) {
generator.button_switch(true); //generator.button_switch(true);
return generator.generate(scope, res.data); return generator.generate(scope, res.data);
}); });
}; };
...@@ -770,11 +770,11 @@ angular.module('ulakbus.formService', ['ui.bootstrap']) ...@@ -770,11 +770,11 @@ angular.module('ulakbus.formService', ['ui.bootstrap'])
* @returns {*} * @returns {*}
*/ */
generator.get_list = function (scope) { generator.get_list = function (scope) {
generator.button_switch(false); //generator.button_switch(false);
return $http return $http
.post(generator.makeUrl(scope), scope.form_params) .post(generator.makeUrl(scope), scope.form_params)
.then(function (res) { .then(function (res) {
generator.button_switch(true); //generator.button_switch(true);
return res; return res;
}); });
}; };
...@@ -788,11 +788,11 @@ angular.module('ulakbus.formService', ['ui.bootstrap']) ...@@ -788,11 +788,11 @@ angular.module('ulakbus.formService', ['ui.bootstrap'])
* @returns {*} * @returns {*}
*/ */
generator.get_wf = function (scope) { generator.get_wf = function (scope) {
generator.button_switch(false); //generator.button_switch(false);
return $http return $http
.post(generator.makeUrl(scope), scope.form_params) .post(generator.makeUrl(scope), scope.form_params)
.then(function (res) { .then(function (res) {
generator.button_switch(true); //generator.button_switch(true);
return generator.pathDecider(res.data.client_cmd, scope, res.data); return generator.pathDecider(res.data.client_cmd, scope, res.data);
}); });
}; };
......
dist/app.js
View file @ ceb5b67f
This diff is collapsed.
dist/index.html
View file @ ceb5b67f
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<link rel="stylesheet" href="css/roboto/roboto.css"> <link rel="stylesheet" href="css/roboto/roboto.css">
<link rel="stylesheet" href="css/jquery-ui.min.css"> <link rel="stylesheet" href="css/jquery-ui.min.css">
</head> </head>
<body ng-controller="KeyListenController" ng-keydown="down($event)" ng-show="$root.showApp"> <body ng-controller="KeyListenController" ng-keydown="down($event)">
<nav class="navbar navbar-default navbar-static-top" role="navigation" style="margin-bottom: 0" ng-if="$root.loggedInUser"> <nav class="navbar navbar-default navbar-static-top" role="navigation" style="margin-bottom: 0" ng-if="$root.loggedInUser">
<collapse-menu></collapse-menu> <collapse-menu></collapse-menu>
......
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