From a9716a712b1e41828342e1223761442c7b1e8f9a Mon Sep 17 00:00:00 2001
From: jiazhong <jiazhong@ebay.com>
Date: Tue, 23 Dec 2014 17:40:49 +0800
Subject: [PATCH] add error tip when project is null for loading hive table

---
 webapp/app/js/controllers/cubes.js              | 1 -
 webapp/app/js/controllers/sourceMeta.js         | 6 ++++++
 webapp/app/partials/tables/source_metadata.html | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/webapp/app/js/controllers/cubes.js b/webapp/app/js/controllers/cubes.js
index 1edad8c..6c3fc93 100644
--- a/webapp/app/js/controllers/cubes.js
+++ b/webapp/app/js/controllers/cubes.js
@@ -79,7 +79,6 @@ KylinApp
         });
         $scope.reload = function () {
             // trigger reload action in pagination directive
-                $scope.action.reload = false;
             $scope.action.reload = !$scope.action.reload;
         };
 
diff --git a/webapp/app/js/controllers/sourceMeta.js b/webapp/app/js/controllers/sourceMeta.js
index 6586444..bb8b8af 100644
--- a/webapp/app/js/controllers/sourceMeta.js
+++ b/webapp/app/js/controllers/sourceMeta.js
@@ -159,6 +159,12 @@ KylinApp
                     SweetAlert.swal('','Please input table(s) you want to synchronize.', 'info');
                   return;
                 }
+
+                if(!$scope.projectName){
+                    SweetAlert.swal('','Please choose your project first!.', 'info');
+                    return;
+                }
+
                 $scope.cancel();
                 loadingRequest.show();
                 TableService.loadHiveTable({tableName: $scope.tableNames,action:projectName}, {}, function (result) {
diff --git a/webapp/app/partials/tables/source_metadata.html b/webapp/app/partials/tables/source_metadata.html
index 22f41ff..c50ccc5 100644
--- a/webapp/app/partials/tables/source_metadata.html
+++ b/webapp/app/partials/tables/source_metadata.html
@@ -153,7 +153,7 @@ <h3 class="text-info">Table Schema:{{ selectedSrcTable.name}}</h3>
                 <h4>Load Hive Table Metadata</h4>
             </div>
             <div class="modal-body">
-                <span><strong>Project: </strong>{{ $parent.projectName }}</span>
+                <span><strong>Project: </strong>{{ $parent.projectName!=null?$parent.projectName:'NULL'}}</span>
                 <label for="tables"> Table Names:(Seperate with comma)</label>
                 <textarea ng-model="$parent.tableNames" class="form-control" id="tables"
                           placeholder="table1,table2  By default,system will choose 'Default' as database,you can specify database like this 'database.table'"></textarea>