From 730e05293f5c39ddfacf440f831d0a3dec6c6495 Mon Sep 17 00:00:00 2001
From: jiazhong <jiazhong@ebay.com>
Date: Mon, 8 Dec 2014 18:48:52 +0800
Subject: [PATCH 1/2] enhance cubeEdit init func

---
 webapp/app/js/controllers/cubeSchema.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/app/js/controllers/cubeSchema.js b/webapp/app/js/controllers/cubeSchema.js
index df3a918..df0f644 100644
--- a/webapp/app/js/controllers/cubeSchema.js
+++ b/webapp/app/js/controllers/cubeSchema.js
@@ -80,7 +80,7 @@ KylinApp.controller('CubeSchemaCtrl', function ($scope, QueryService, UserServic
     });
 
     $scope.$watch('cubeMetaFrame', function (newValue, oldValue) {
-        if (newValue && !newValue.project) {
+        if ($scope.cubeMode=="editExistCube"&&newValue && !newValue.project) {
             initProject();
             generateCubeStatus($scope.cubeMetaFrame);
         }

From 5d932955a1d052e76cdcddac3de10db3397cbebc Mon Sep 17 00:00:00 2001
From: jiazhong <jiazhong@ebay.com>
Date: Tue, 9 Dec 2014 10:27:50 +0800
Subject: [PATCH 2/2] clear project after logout

---
 webapp/app/js/controllers/page.js | 9 ++++++---
 webapp/app/js/listeners.js        | 5 +----
 webapp/app/partials/login.html    | 4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/webapp/app/js/controllers/page.js b/webapp/app/js/controllers/page.js
index 49be7e7..9ef4bc1 100644
--- a/webapp/app/js/controllers/page.js
+++ b/webapp/app/js/controllers/page.js
@@ -22,13 +22,13 @@ KylinApp.controller('PageCtrl', function ($scope, $q, AccessService,$modal, $loc
     // Set up common methods
     $scope.logout = function () {
         $scope.$emit('event:logoutRequest');
-
         $http.get(Config.service.base + 'j_spring_security_logout').success(function () {
             UserService.setCurUser({});
             $scope.username = $scope.password = null;
             $location.path('/login');
 
             console.debug("Logout Completed.");
+            $scope.project.selectedProject = null;
         }).error(function () {
             UserService.setCurUser({});
             $scope.username = $scope.password = null;
@@ -128,7 +128,10 @@ KylinApp.controller('PageCtrl', function ($scope, $q, AccessService,$modal, $loc
             $scope.project.projects.push(project.name);
         });
 
-        $scope.project.selectedProject=$scope.project.selectedProject!=null?$scope.project.selectedProject:$scope.project.projects[0]
+        var absUrl = $location.absUrl();
+        if(absUrl.indexOf("/login")==-1){
+            $scope.project.selectedProject=$scope.project.selectedProject!=null?$scope.project.selectedProject:$scope.project.projects[0]
+        }
 
     });
 
@@ -149,7 +152,7 @@ KylinApp.controller('PageCtrl', function ($scope, $q, AccessService,$modal, $loc
 
 });
 
-var projCtrl = function ($scope, $modalInstance, ProjectService, MessageService, projects, project) {
+var projCtrl = function ($scope, $modalInstance, ProjectService, MessageService, projects, project,SweetAlert) {
     $scope.state = {
         isEdit: false,
         oldProjName: null
diff --git a/webapp/app/js/listeners.js b/webapp/app/js/listeners.js
index 1079d9e..ff9e934 100644
--- a/webapp/app/js/listeners.js
+++ b/webapp/app/js/listeners.js
@@ -1,4 +1,4 @@
-KylinApp.run(function ($rootScope, $http, $location, UserService, AuthenticationService, MessageService,rainbowBar,loadingRequest,SweetAlert) {
+KylinApp.run(function ($rootScope,$http, $location, UserService, AuthenticationService, MessageService,rainbowBar,loadingRequest,SweetAlert) {
 
     $rootScope.permissions = {
         READ: {name: 'CUBE QUERY', value: 'READ', mask: 1},
@@ -71,7 +71,6 @@ KylinApp.run(function ($rootScope, $http, $location, UserService, Authentication
      */
     $rootScope.$on('event:forbidden', function (event, message) {
         var msg = !!(message) ? message : 'You don\' have right to take the action.';
-//        MessageService.sendMsg('Permission Denied: ' + msg, 'error', {});
         SweetAlert.swal('Oops...', 'Permission Denied: ' + msg, 'error');
 
     });
@@ -82,7 +81,5 @@ KylinApp.run(function ($rootScope, $http, $location, UserService, Authentication
     $rootScope.$on('event:error', function (event, message) {
         var msg = !!(message) ? message : 'Failed to take action.';
         SweetAlert.swal('Oops...', 'Action Failed: ' + msg, 'error');
-//        MessageService.sendMsg('Action Failed: ' + msg, 'error', {});
-
     });
 });
\ No newline at end of file
diff --git a/webapp/app/partials/login.html b/webapp/app/partials/login.html
index 290f888..ebbfc4a 100644
--- a/webapp/app/partials/login.html
+++ b/webapp/app/partials/login.html
@@ -27,10 +27,10 @@ <h4 class="header blue lighter bigger"> <i class="ace-icon fa fa-coffee green"><
                                 <div class="form-group">
                                     <span>
 
-                                        <select  ng-required="project.projects.length" chosen ng-model="project.selectedProject" ng-init="newAccess.permission=permissions.READ.value;project.selectedProject=null;"
+                                        <select  ng-required="project.projects.length" chosen ng-model="project.selectedProject" ng-init="newAccess.permission=permissions.READ.value;"
                                                 ng-options="project as project for project in project.projects"
                                                 style="width: 100% !important;"
-                                                data-placeholder="Choose Your Project"
+                                                data-placeholder="select a project"
                                                 class="chosen-select">
                                             <option value=""></option>
                                         </select>