From 9872bfbc4075ccac4726c9853b65f4cfa277094f Mon Sep 17 00:00:00 2001
From: jiazhong <jiazhong@ebay.com>
Date: Wed, 19 Nov 2014 19:15:27 +0800
Subject: [PATCH] set default project to selected project on top select when
 edit cube

---
 webapp/app/js/controllers/cubeEdit.js             |  1 +
 webapp/app/js/controllers/cubes.js                |  5 -----
 webapp/app/partials/cubeDesigner/info.html        | 12 ++++--------
 webapp/app/partials/tables/source_table_tree.html |  2 +-
 4 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/webapp/app/js/controllers/cubeEdit.js b/webapp/app/js/controllers/cubeEdit.js
index 2fd0a0b..13af908 100644
--- a/webapp/app/js/controllers/cubeEdit.js
+++ b/webapp/app/js/controllers/cubeEdit.js
@@ -134,6 +134,7 @@ KylinApp.controller('CubeEditCtrl', function ($scope, $q, $routeParams, $locatio
         });
     } else {
         $scope.cubeMetaFrame = CubeMeta.createNew();
+        $scope.cubeMetaFrame.project = $scope.project.selectedProject;
         $scope.state.cubeSchema = angular.toJson($scope.cubeMetaFrame, true);
     }
 
diff --git a/webapp/app/js/controllers/cubes.js b/webapp/app/js/controllers/cubes.js
index 60c153b..9a4652c 100644
--- a/webapp/app/js/controllers/cubes.js
+++ b/webapp/app/js/controllers/cubes.js
@@ -24,11 +24,6 @@ KylinApp
         $scope.state = { filterAttr: 'create_time', filterReverse: true, reverseColumn: 'create_time',
             dimensionFilter: '', measureFilter: ''};
 
-//        ProjectService.list({}, function (projects) {
-//            angular.forEach(projects, function(project, index){
-//                $scope.projects.push(project.name);
-//            });
-//        });
 
         $scope.list = function (offset, limit) {
             offset = (!!offset) ? offset : 0;
diff --git a/webapp/app/partials/cubeDesigner/info.html b/webapp/app/partials/cubeDesigner/info.html
index 6939340..b4c4d19 100644
--- a/webapp/app/partials/cubeDesigner/info.html
+++ b/webapp/app/partials/cubeDesigner/info.html
@@ -4,18 +4,14 @@
         <div class="form-group">
             <div class="row">
                 <label class="col-xs-12 col-sm-3 control-label no-padding-right">
-                    <a ng-if="state.mode=='edit'" href="/projects" tooltip="Click to create a new Project">
-                        <b>Project</b> <i class="fa fa-question-circle"></i>
+                    <a ng-if="state.mode=='edit'" href="/projects">
+                        <b>Project</b>
                     </a>
                     <b ng-if="state.mode=='view'" class="font-color-default">Project</b>
                 </label>
                 <div class="col-xs-12 col-sm-6">
-                    <div ng-if="state.mode=='edit'">
-                        <select chosen class="form-control" ng-model="cubeMetaFrame.project" required
-                                ng-options="project.name as project.name for project in projects | filter: filterProj">
-                            <option value="">-- Select Project --</option>
-                        </select>
-                    </div>
+                    <input ng-if="state.mode=='edit'" name="project_name" type="text" class="form-control"
+                           ng-model="cubeMetaFrame.project" disabled/>
                     <span ng-if="state.mode=='view'">
                         {{cubeMetaFrame.project}}
                     </span>
diff --git a/webapp/app/partials/tables/source_table_tree.html b/webapp/app/partials/tables/source_table_tree.html
index 712afd8..d561bcd 100644
--- a/webapp/app/partials/tables/source_table_tree.html
+++ b/webapp/app/partials/tables/source_table_tree.html
@@ -1,5 +1,5 @@
 <div ng-animate="{enter: 'fadeInDown animated'}">
-    <h3 class="text-info">Source Tables</h3>
+    <h3 class="text-info">Tables</h3>
     <div class="tree-border">
         <div class="row">
             <div class="col-xs-7">