You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by li...@apache.org on 2015/03/14 01:01:52 UTC
[39/50] incubator-kylin git commit: config right authorize url
Kylin-570
config right authorize url Kylin-570
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/2e981533
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/2e981533
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/2e981533
Branch: refs/heads/streaming
Commit: 2e981533a024d4b9e5ee7f1d8132ed5ca16b5563
Parents: 7dae30e
Author: jiazhong <ji...@ebay.com>
Authored: Tue Mar 10 17:17:52 2015 +0800
Committer: jiazhong <ji...@ebay.com>
Committed: Tue Mar 10 17:17:52 2015 +0800
----------------------------------------------------------------------
server/src/main/resources/kylinSecurity.xml | 2 +-
webapp/app/js/controllers/auth.js | 2 --
webapp/app/js/controllers/cube.js | 2 +-
webapp/app/js/listeners.js | 7 -------
4 files changed, 2 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/2e981533/server/src/main/resources/kylinSecurity.xml
----------------------------------------------------------------------
diff --git a/server/src/main/resources/kylinSecurity.xml b/server/src/main/resources/kylinSecurity.xml
index af1b83b..518a9bd 100644
--- a/server/src/main/resources/kylinSecurity.xml
+++ b/server/src/main/resources/kylinSecurity.xml
@@ -12,7 +12,7 @@
<scr:http auto-config="true" use-expressions="true">
<scr:http-basic entry-point-ref="unauthorisedEntryPoint" />
- <scr:intercept-url pattern="/api/user/authenticate*/**" access="permitAll" />
+ <scr:intercept-url pattern="/api/user/authentication*/**" access="permitAll" />
<scr:intercept-url pattern="/api/query*/**" access="isAuthenticated()" />
<scr:intercept-url pattern="/api/metadata*/**" access="isAuthenticated()" />
<scr:intercept-url pattern="/api/**/metrics" access="permitAll" />
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/2e981533/webapp/app/js/controllers/auth.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/controllers/auth.js b/webapp/app/js/controllers/auth.js
index 376d1b1..f7fbfea 100644
--- a/webapp/app/js/controllers/auth.js
+++ b/webapp/app/js/controllers/auth.js
@@ -43,7 +43,5 @@ KylinApp.controller('LoginCtrl', function ($scope, $rootScope, $location, $base6
$scope.loading = false;
$scope.error = "Unable to login, please check your username/password.";
});
-
- console.debug("Login event requested.");
};
});
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/2e981533/webapp/app/js/controllers/cube.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/controllers/cube.js b/webapp/app/js/controllers/cube.js
index 689496a..607706d 100755
--- a/webapp/app/js/controllers/cube.js
+++ b/webapp/app/js/controllers/cube.js
@@ -18,7 +18,7 @@
'use strict';
-KylinApp.controller('CubeCtrl', function ($scope, AccessService, MessageService, CubeService, TableService, CubeGraphService, UserService, AuthenticationService,SweetAlert) {
+KylinApp.controller('CubeCtrl', function ($scope, AccessService, MessageService, CubeService, TableService, CubeGraphService, UserService,SweetAlert) {
$scope.newAccess = null;
$scope.state = {jsonEdit: false};
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/2e981533/webapp/app/js/listeners.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/listeners.js b/webapp/app/js/listeners.js
index 45f886a..4524696 100644
--- a/webapp/app/js/listeners.js
+++ b/webapp/app/js/listeners.js
@@ -92,11 +92,4 @@ KylinApp.run(function ($rootScope,$http, $location, UserService, AuthenticationS
});
- /**
- * On 'event:error', resend all the 500 requests.
- */
-// $rootScope.$on('event:error', function (event, message) {
-// var msg = !!(message) ? message : 'Failed to take action.';
-// SweetAlert.swal('Oops...', 'Action Failed: ' + msg, 'error');
-// });
});