From 48a03e108ba7bc7ea2cd037c3d7d904ce4430234 Mon Sep 17 00:00:00 2001 From: jiazhong Date: Mon, 15 Dec 2014 18:09:41 +0800 Subject: [PATCH 1/2] enhance header navbar link style a:link a:visited --- webapp/app/less/navbar.less | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/webapp/app/less/navbar.less b/webapp/app/less/navbar.less index ede7e07..cad2562 100644 --- a/webapp/app/less/navbar.less +++ b/webapp/app/less/navbar.less @@ -126,11 +126,15 @@ .navbar-nav:not(.navbar-right)> li > a { font-size: 16px !important; } - .navbar-nav> li.purple > a { background-color: #892e65; } - +.navbar-nav> li.purple > a:link { + background-color: #892e65 !important; + } +.navbar-nav> li.purple > a:visited { + background-color: #892e65 !important; +} .navbar-nav>li.purple>a:hover { background-color: #762c59 !important; } From 1da8cf22b04153c05f8d6402c3c301ab46fd84e3 Mon Sep 17 00:00:00 2001 From: jiazhong Date: Tue, 16 Dec 2014 17:05:41 +0800 Subject: [PATCH 2/2] add cookie to store project in browser --- .../com/kylinolap/rest/service/CubeService.java | 2 +- webapp/app/js/app.js | 2 +- webapp/app/js/controllers/page.js | 22 +++++++++++++++++----- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/server/src/main/java/com/kylinolap/rest/service/CubeService.java b/server/src/main/java/com/kylinolap/rest/service/CubeService.java index 9417618..0215504 100644 --- a/server/src/main/java/com/kylinolap/rest/service/CubeService.java +++ b/server/src/main/java/com/kylinolap/rest/service/CubeService.java @@ -175,7 +175,7 @@ public CubeInstance createCubeAndDesc(String cubeName, String projectName, CubeD logger.info("New cube " + cubeName + " has " + cuboidCount + " cuboids"); } catch (Exception e) { getMetadataManager().removeCubeDesc(createdDesc); - throw new InternalErrorException("Failed to deal with the request.", e); + throw new InternalErrorException("Failed to deal with the request."+e.getLocalizedMessage(), e); } createdCube = getCubeManager().createCube(cubeName, projectName, createdDesc, owner); diff --git a/webapp/app/js/app.js b/webapp/app/js/app.js index 781226b..0aa7c21 100644 --- a/webapp/app/js/app.js +++ b/webapp/app/js/app.js @@ -1,2 +1,2 @@ //Kylin Application Module -KylinApp = angular.module('kylin', ['ngRoute', 'ngResource', 'ngGrid', 'ui.bootstrap', 'ui.ace', 'base64', 'angularLocalStorage', 'localytics.directives', 'treeControl', 'nvd3ChartDirectives','ngLoadingRequest','oitozero.ngSweetAlert']); \ No newline at end of file +KylinApp = angular.module('kylin', ['ngRoute', 'ngResource', 'ngGrid', 'ui.bootstrap', 'ui.ace', 'base64', 'angularLocalStorage', 'localytics.directives', 'treeControl', 'nvd3ChartDirectives','ngLoadingRequest','oitozero.ngSweetAlert','ngCookies']); \ No newline at end of file diff --git a/webapp/app/js/controllers/page.js b/webapp/app/js/controllers/page.js index 1b0684d..3e8a75a 100644 --- a/webapp/app/js/controllers/page.js +++ b/webapp/app/js/controllers/page.js @@ -1,6 +1,6 @@ 'use strict'; -KylinApp.controller('PageCtrl', function ($scope, $q, AccessService,$modal, $location, $rootScope, $routeParams, $http, UserService,ProjectService,SweetAlert) { +KylinApp.controller('PageCtrl', function ($scope, $q, AccessService,$modal, $location, $rootScope, $routeParams, $http, UserService,ProjectService,SweetAlert,$cookieStore) { $scope.header = {show: true}; $scope.footer = { @@ -122,17 +122,19 @@ KylinApp.controller('PageCtrl', function ($scope, $q, AccessService,$modal, $loc projects:[], selectedProject: null }; - ProjectService.list({}, function (projects) { + ProjectService.list({}, function (projects) { angular.forEach(projects, function(project, index){ $scope.project.projects.push(project.name); }); - var absUrl = $location.absUrl(); + + var projectInCookie = $cookieStore.get("project"); if(absUrl.indexOf("/login")==-1){ - $scope.project.selectedProject=$scope.project.selectedProject!=null?$scope.project.selectedProject:$scope.project.projects[0] + $scope.project.selectedProject=$scope.project.selectedProject!=null?$scope.project.selectedProject:projectInCookie!=null?projectInCookie:$scope.project.projects[0] + }else{ + $scope.project.selectedProject=projectInCookie!=null?projectInCookie:null; } - }); $scope.toCreateProj = function () { @@ -150,6 +152,15 @@ KylinApp.controller('PageCtrl', function ($scope, $q, AccessService,$modal, $loc }); }; + + $scope.$watch('project.selectedProject', function (newValue, oldValue) { + if(newValue){ + console.log("project updated in page controller"); + $cookieStore.put("project",$scope.project.selectedProject); + } + + }); + }); var projCtrl = function ($scope, $modalInstance, ProjectService, MessageService, projects, project,SweetAlert) { @@ -211,4 +222,5 @@ var projCtrl = function ($scope, $modalInstance, ProjectService, MessageService, $scope.cancel = function () { $modalInstance.dismiss('cancel'); }; + };