From 0a9d122ed4a9323c96edf3c8b5c1be4f89ec9756 Mon Sep 17 00:00:00 2001
From: jiazhong <jiazhong@ebay.com>
Date: Thu, 27 Nov 2014 19:07:09 +0800
Subject: [PATCH] fix page duplicate reload issue which  cause jobs list showed
 not right

---
 webapp/app/js/controllers/cubeEdit.js  | 45 +++++++++++++++++-----------------
 webapp/app/js/controllers/cubes.js     |  1 -
 webapp/app/js/controllers/job.js       |  2 +-
 webapp/app/js/directives/directives.js |  2 +-
 webapp/app/partials/cubes/cubes.html   |  2 +-
 webapp/app/partials/jobs/jobs.html     |  2 +-
 6 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/webapp/app/js/controllers/cubeEdit.js b/webapp/app/js/controllers/cubeEdit.js
index e7eeeb6..3a5f711 100644
--- a/webapp/app/js/controllers/cubeEdit.js
+++ b/webapp/app/js/controllers/cubeEdit.js
@@ -310,34 +310,35 @@ KylinApp.controller('CubeEditCtrl', function ($scope, $q, $routeParams, $locatio
         //! here get the latest rowkey_columns
         $scope.cubeMetaFrame.rowkey.rowkey_columns = newRowKeyColumns;
 
-
-        var aggregationGroups = $scope.cubeMetaFrame.rowkey.aggregation_groups;
-        // rm unused item from group
-        angular.forEach(aggregationGroups, function (group, index) {
-            if(group){
-                for(var j = 0;j<group.length;j++){
-                    var elemStillExist = false;
-                    for(var k = 0;k<tmpAggregationItems.length;k++){
-                        if(group[j]==tmpAggregationItems[k]){
-                            elemStillExist = true;
-                            break;
+        if($scope.cubeMode==="editExistCube") {
+            var aggregationGroups = $scope.cubeMetaFrame.rowkey.aggregation_groups;
+            // rm unused item from group
+            angular.forEach(aggregationGroups, function (group, index) {
+                if (group) {
+                    for (var j = 0; j < group.length; j++) {
+                        var elemStillExist = false;
+                        for (var k = 0; k < tmpAggregationItems.length; k++) {
+                            if (group[j] == tmpAggregationItems[k]) {
+                                elemStillExist = true;
+                                break;
+                            }
+                        }
+                        if (!elemStillExist) {
+                            group.splice(j, 1);
+                            j--;
                         }
                     }
-                    if(!elemStillExist){
-                        group.splice(j,1);
-                        j--;
+                    if (!group.length) {
+                        aggregationGroups.splice(index, 1);
+                        index--;
                     }
                 }
-                if(!group.length){
-                    aggregationGroups.splice(index,1);
+                else {
+                    aggregationGroups.splice(index, 1);
                     index--;
                 }
-            }
-            else{
-                aggregationGroups.splice(index,1);
-                index--;
-            }
-        });
+            });
+        }
 
         if($scope.cubeMode==="addNewCube"){
 
diff --git a/webapp/app/js/controllers/cubes.js b/webapp/app/js/controllers/cubes.js
index a391321..423e783 100644
--- a/webapp/app/js/controllers/cubes.js
+++ b/webapp/app/js/controllers/cubes.js
@@ -76,7 +76,6 @@ KylinApp
            if(newValue){
             $scope.cubes=[];
             $scope.list();
-            $scope.reload();
            }
 
         });
diff --git a/webapp/app/js/controllers/job.js b/webapp/app/js/controllers/job.js
index 1162953..345b2b3 100644
--- a/webapp/app/js/controllers/job.js
+++ b/webapp/app/js/controllers/job.js
@@ -85,7 +85,7 @@ KylinApp
             if(newValue){
                 $scope.jobs={};
                 $scope.state.projectName = newValue;
-            $scope.list();
+                $scope.list();
             }
 
         });
diff --git a/webapp/app/js/directives/directives.js b/webapp/app/js/directives/directives.js
index cbb8e24..d024fcd 100644
--- a/webapp/app/js/directives/directives.js
+++ b/webapp/app/js/directives/directives.js
@@ -23,7 +23,7 @@ KylinApp.directive('kylinPagination', function ($parse, $q) {
             });
 
             var autoLoad = $parse(attrs.autoLoad)(scope.$parent);
-            if (autoLoad) {
+            if (autoLoad==false) {
                 scope.autoLoad = autoLoad;
             }
 
diff --git a/webapp/app/partials/cubes/cubes.html b/webapp/app/partials/cubes/cubes.html
index aff17d5..5a689a8 100644
--- a/webapp/app/partials/cubes/cubes.html
+++ b/webapp/app/partials/cubes/cubes.html
@@ -130,7 +130,7 @@
 
 <div class="row">
     <div class="col-xs-12">
-        <kylin-pagination data="cubes" load-func="list" action="action"/>
+        <kylin-pagination data="cubes" load-func="list" auto-load="false" action="action"/>
     </div>
 </div>
 <div class="pull-left font-color-default" style="font-size: 15px" >
diff --git a/webapp/app/partials/jobs/jobs.html b/webapp/app/partials/jobs/jobs.html
index faf02e0..4a1522f 100644
--- a/webapp/app/partials/jobs/jobs.html
+++ b/webapp/app/partials/jobs/jobs.html
@@ -138,7 +138,7 @@
             </table>
         </div>
 
-        <kylin-pagination data="jobs" load-func="list" action="action"/>
+        <kylin-pagination data="jobs" load-func="list" auto-load="false" action="action"/>
     </div>
     <div class="col-xs-4" ng-if="state.showSteps" ng-animate="{enter: 'animated fadeInRight'}">
         <div ng-include src="'partials/jobs/job_steps.html'"></div>