From f4c59c2f26b06765255b836e4c71602f5e4b62b6 Mon Sep 17 00:00:00 2001
From: jiazhong <jiazhong@ebay.com>
Date: Fri, 21 Nov 2014 18:46:21 +0800
Subject: [PATCH] fixed aggregation groups option bug -use rowkey column
 instead of dimension name

---
 .../app/partials/cubeDesigner/advanced_settings.html |  4 ++--
 webapp/app/partials/cubes/cube_json_edit.html        | 20 ++++++++++++--------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/webapp/app/partials/cubeDesigner/advanced_settings.html b/webapp/app/partials/cubeDesigner/advanced_settings.html
index 7b2eaef..0a141ba 100644
--- a/webapp/app/partials/cubeDesigner/advanced_settings.html
+++ b/webapp/app/partials/cubeDesigner/advanced_settings.html
@@ -20,7 +20,7 @@ <h4 style="margin-left:42px">Aggreation Groups</h4>
                     <select ng-if="state.mode=='edit'" style="width: 100%"
                             ng-model="aggregation_groups" required chosen multiple
                             ng-change="refreshAggregationGroup(cubeMetaFrame.rowkey.aggregation_groups, $index, aggregation_groups)"
-                            ng-options="dimension.name as dimension.name for dimension in cubeMetaFrame.dimensions">
+                            ng-options="rowkey_column.column as rowkey_column.column for rowkey_column in cubeMetaFrame.rowkey.rowkey_columns">
                     </select>
                     <p ng-if="state.mode=='view'" style="word-wrap: break-word; word-break: normal;max-width: 1000px ">{{aggregation_groups}}</p>
                 </td>
@@ -109,7 +109,7 @@ <h4 style="margin-left:42px">Rowkeys</h4>
         </table>
 
         <button class="btn btn-sm btn-info" style="margin-left:42px"
-                ng-click="addNewRowkeyColumn()" ng-show="state.mode=='edit'">New Rowkey Column<i class="fa fa-plus"></i></button>
+                ng-click="addNewRowkeyColumn()" ng-show="state.mode=='edit'">New RowkeyColumn<i class="fa fa-plus"></i></button>
     </div>
 </div>
 
diff --git a/webapp/app/partials/cubes/cube_json_edit.html b/webapp/app/partials/cubes/cube_json_edit.html
index b4910b5..65d7958 100644
--- a/webapp/app/partials/cubes/cube_json_edit.html
+++ b/webapp/app/partials/cubes/cube_json_edit.html
@@ -7,13 +7,17 @@
             <form role="form" name="cube_form" novalidate>
                 <div class="row">
                     <div class="col-xs-12">
-                        <h3>Project
-                            <select class="inline form-control" ng-model="cubeMetaFrame.project" required
-                                    ng-options="project.name as project.name for project in projects | filter: filterProj"
-                                    style="width: 250px">
-                                <option value="">-- Select Project --</option>
-                            </select>
-                        </h3>
+                        <form class="navbar-form navbar-left" style="margin-top: 0px !important;" ng-if="userService.isAuthorized()">
+                            <div class="form-group">
+                                <span><b>Project: </b></span>
+                                <select chosen ng-model="project.selectedProject" ng-init="newAccess.permission=permissions.READ.value;project.selectedProject=project.selectedProject!=null?project.selectedProject:project.projects[0]"
+                                        ng-options="project as project for project in project.projects"
+                                        style="width: 150px"
+                                        data-placeholder="select a project"
+                                        class="chosen-select">
+                                </select>
+                            </div>
+                        </form>
                     </div>
                 </div>
                 <section style="padding-bottom: 20px">
@@ -28,7 +32,7 @@
                                     }" ng-model="state.cubeSchema">
                     </div>
                 </section>
-                <button class="btn btn-primary" ng-disabled="cube_form.$invalid" ng-click="state.project = cubeMetaFrame.project;saveCube()">
+                <button class="btn btn-primary" ng-disabled="cube_form.$invalid" ng-click="state.project = project.selectedProject;saveCube()">
                     Save
                 </button>
             </form>