From 488d25382b97d66b96490a5c2e9937f8221afb92 Mon Sep 17 00:00:00 2001
From: jiazhong <jiazhong@ebay.com>
Date: Tue, 18 Nov 2014 21:04:13 +0800
Subject: [PATCH] reactor js & add add project html to sub pages avoid refresh
 page bug

---
 webapp/app/js/controllers/cubes.js              | 15 ---------------
 webapp/app/js/controllers/job.js                | 15 ---------------
 webapp/app/js/controllers/page.js               | 12 ++++++------
 webapp/app/js/controllers/projects.js           | 15 ---------------
 webapp/app/partials/cubes/cubes.html            |  1 +
 webapp/app/partials/query/query.html            |  1 +
 webapp/app/partials/tables/source_metadata.html |  2 ++
 7 files changed, 10 insertions(+), 51 deletions(-)

diff --git a/webapp/app/js/controllers/cubes.js b/webapp/app/js/controllers/cubes.js
index 2407877..60c153b 100644
--- a/webapp/app/js/controllers/cubes.js
+++ b/webapp/app/js/controllers/cubes.js
@@ -83,21 +83,6 @@ KylinApp
             $scope.action.reload = !$scope.action.reload;
         };
 
-        $scope.toCreateProj = function () {
-            $modal.open({
-                templateUrl: 'project.html',
-                controller: projCtrl,
-                resolve: {
-                    projects: function () {
-                        return null;
-                    },
-                    project: function(){
-                        return null;
-                    }
-                }
-            });
-        };
-
         $scope.loadDetail = function (cube) {
             if (!cube.detail) {
                 CubeDescService.get({cube_name: cube.name}, {}, function (detail) {
diff --git a/webapp/app/js/controllers/job.js b/webapp/app/js/controllers/job.js
index 8c23717..155edf2 100644
--- a/webapp/app/js/controllers/job.js
+++ b/webapp/app/js/controllers/job.js
@@ -128,21 +128,6 @@ KylinApp
             }
         }
 
-        $scope.toCreateProj = function () {
-            $modal.open({
-                templateUrl: 'project.html',
-                controller: projCtrl,
-                resolve: {
-                    projects: function () {
-                        return null;
-                    },
-                    project: function(){
-                        return null;
-                    }
-                }
-            });
-        }
-
         function internalOpenModal() {
             $modal.open({
                 templateUrl: 'jobStepDetail.html',
diff --git a/webapp/app/js/controllers/page.js b/webapp/app/js/controllers/page.js
index e56f272..49b8a3d 100644
--- a/webapp/app/js/controllers/page.js
+++ b/webapp/app/js/controllers/page.js
@@ -42,11 +42,11 @@ KylinApp.controller('PageCtrl', function ($scope, $q, AccessService,$modal, $loc
     Messenger.options = {
         extraClasses: 'messenger-fixed messenger-on-bottom messenger-on-right',
         theme: 'air'
-    }
+    };
 
     $scope.getInt = function (ivalue) {
         return parseInt(ivalue);
-    }
+    };
 
     $scope.getLength = function (obj) {
         if (!obj) {
@@ -57,7 +57,7 @@ KylinApp.controller('PageCtrl', function ($scope, $q, AccessService,$modal, $loc
             if (obj.hasOwnProperty(key)) size++;
         }
         return size;
-    }
+    };
 
     // common acl methods
     $scope.hasPermission = function (entity) {
@@ -86,7 +86,7 @@ KylinApp.controller('PageCtrl', function ($scope, $q, AccessService,$modal, $loc
         }
 
         return hasPermission;
-    }
+    };
 
     $scope.listAccess = function (entity, type) {
         var defer = $q.defer();
@@ -99,7 +99,7 @@ KylinApp.controller('PageCtrl', function ($scope, $q, AccessService,$modal, $loc
         });
 
         return defer.promise;
-    }
+    };
 
     // Compute data size so as to auto convert to KB/MB/GB/TB)
     $scope.dataSize = function (data) {
@@ -114,7 +114,7 @@ KylinApp.controller('PageCtrl', function ($scope, $q, AccessService,$modal, $loc
             size = (data/1024).toFixed(2) + ' KB';
         }
         return size;
-    }
+    };
 
 
 
diff --git a/webapp/app/js/controllers/projects.js b/webapp/app/js/controllers/projects.js
index d2cc931..7884731 100644
--- a/webapp/app/js/controllers/projects.js
+++ b/webapp/app/js/controllers/projects.js
@@ -59,21 +59,6 @@ KylinApp
                 });
             }
         }
-
-        $scope.toCreateProj = function () {
-            $modal.open({
-                templateUrl: 'project.html',
-                controller: projCtrl,
-                resolve: {
-                    projects: function () {
-                        return $scope.projects;
-                    },
-                    project: function(){
-                        return null;
-                    }
-                }
-            });
-        }
     }
 );
 
diff --git a/webapp/app/partials/cubes/cubes.html b/webapp/app/partials/cubes/cubes.html
index 2a00e8d..aff17d5 100644
--- a/webapp/app/partials/cubes/cubes.html
+++ b/webapp/app/partials/cubes/cubes.html
@@ -141,3 +141,4 @@
 <div ng-include="'partials/jobs/job_refresh.html'"></div>
 <div ng-include="'partials/jobs/job_merge.html'"></div>
 <div ng-include="'partials/projects/project_create.html'"></div>
+
diff --git a/webapp/app/partials/query/query.html b/webapp/app/partials/query/query.html
index 6cc2db1..0a9091e 100644
--- a/webapp/app/partials/query/query.html
+++ b/webapp/app/partials/query/query.html
@@ -216,3 +216,4 @@ <h3 class="kylin_title">
         <div ng-include="'partials/query/query_detail.html'"></div>
     </div>
 </div>
+<div ng-include="'partials/projects/project_create.html'"></div>
\ No newline at end of file
diff --git a/webapp/app/partials/tables/source_metadata.html b/webapp/app/partials/tables/source_metadata.html
index d27cfb5..f2b3335 100644
--- a/webapp/app/partials/tables/source_metadata.html
+++ b/webapp/app/partials/tables/source_metadata.html
@@ -163,3 +163,5 @@ <h3 class="text-info">Table Schema:{{ selectedSrcTable.name}}</h3>
         </script>
     </div>
 </div>
+
+<div ng-include="'partials/projects/project_create.html'"></div>
\ No newline at end of file