You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by ma...@apache.org on 2015/05/15 07:22:12 UTC
[43/52] [abbrv] incubator-kylin git commit: #KYLIN-661,
only admin can drop model
#KYLIN-661,only admin can drop model
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/00888849
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/00888849
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/00888849
Branch: refs/heads/0.8.0
Commit: 00888849269fc0a4a03d709f221ad03cf736a0a2
Parents: 97963b8
Author: jiazhong <ji...@ebay.com>
Authored: Tue Apr 7 17:45:12 2015 +0800
Committer: honma <ho...@ebay.com>
Committed: Fri May 15 11:38:33 2015 +0800
----------------------------------------------------------------------
webapp/app/js/controllers/modelSchema.js | 6 +++---
webapp/app/partials/models/model_detail.html | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/00888849/webapp/app/js/controllers/modelSchema.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/controllers/modelSchema.js b/webapp/app/js/controllers/modelSchema.js
index 81df1df..17a3b06 100644
--- a/webapp/app/js/controllers/modelSchema.js
+++ b/webapp/app/js/controllers/modelSchema.js
@@ -135,9 +135,9 @@ KylinApp.controller('ModelSchemaCtrl', function ($scope, QueryService, UserServi
*/
$scope.check_data_model = function(){
var errors = [];
- if(!$scope.model.lookups.length){
- errors.push("No lookup table defined");
- }
+// if(!$scope.model.lookups.length){
+// errors.push("No lookup table defined");
+// }
var errorInfo = "";
angular.forEach(errors,function(item){
errorInfo+="\n"+item;
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/00888849/webapp/app/partials/models/model_detail.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/models/model_detail.html b/webapp/app/partials/models/model_detail.html
index bda87c1..dd8b23c 100644
--- a/webapp/app/partials/models/model_detail.html
+++ b/webapp/app/partials/models/model_detail.html
@@ -37,7 +37,7 @@
<li ng-if="userService.hasRole('ROLE_ADMIN') || hasPermission(model, permissions.ADMINISTRATION.mask, permissions.MANAGEMENT.mask, permissions.OPERATION.mask)">
<a href="models/edit/{{model.name}}" data-widget="collapse">Edit</a>
</li>
- <li ng-if="userService.hasRole('ROLE_ADMIN') || hasPermission(model, permissions.ADMINISTRATION.mask, permissions.MANAGEMENT.mask, permissions.OPERATION.mask)">
+ <li ng-if="userService.hasRole('ROLE_ADMIN')">
<a ng-click="dropModel(model)">Drop</a>
</li>
<li role="presentation" class="divider"></li>