You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by zh...@apache.org on 2016/08/05 05:55:45 UTC
kylin git commit: KYLIN-1940 add owner for model
Repository: kylin
Updated Branches:
refs/heads/master e885b750a -> 5e83cd734
KYLIN-1940 add owner for model
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/5e83cd73
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/5e83cd73
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/5e83cd73
Branch: refs/heads/master
Commit: 5e83cd7344bd7cb3ddeed2bd76cfa4c0f3f02987
Parents: e885b75
Author: Jason <ji...@163.com>
Authored: Fri Aug 5 13:53:15 2016 +0800
Committer: Jason <ji...@163.com>
Committed: Fri Aug 5 13:55:06 2016 +0800
----------------------------------------------------------------------
.../org/apache/kylin/metadata/MetadataManager.java | 1 +
.../org/apache/kylin/metadata/model/DataModelDesc.java | 11 +++++++++++
webapp/app/js/model/modelsManager.js | 10 +++++++++-
webapp/app/partials/modelDesigner/model_info.html | 13 +++++++++++++
4 files changed, 34 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/5e83cd73/core-metadata/src/main/java/org/apache/kylin/metadata/MetadataManager.java
----------------------------------------------------------------------
diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/MetadataManager.java b/core-metadata/src/main/java/org/apache/kylin/metadata/MetadataManager.java
index c8e086e..965da0a 100644
--- a/core-metadata/src/main/java/org/apache/kylin/metadata/MetadataManager.java
+++ b/core-metadata/src/main/java/org/apache/kylin/metadata/MetadataManager.java
@@ -465,6 +465,7 @@ public class MetadataManager {
if (dataModelDescMap.containsKey(name))
throw new IllegalArgumentException("DataModelDesc '" + name + "' already exists");
ProjectManager.getInstance(config).updateModelToProject(name, projectName);
+ desc.setOwner(owner);
return saveDataModelDesc(desc);
}
http://git-wip-us.apache.org/repos/asf/kylin/blob/5e83cd73/core-metadata/src/main/java/org/apache/kylin/metadata/model/DataModelDesc.java
----------------------------------------------------------------------
diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/model/DataModelDesc.java b/core-metadata/src/main/java/org/apache/kylin/metadata/model/DataModelDesc.java
index 7e8a41b..ebdfa99 100644
--- a/core-metadata/src/main/java/org/apache/kylin/metadata/model/DataModelDesc.java
+++ b/core-metadata/src/main/java/org/apache/kylin/metadata/model/DataModelDesc.java
@@ -51,6 +51,9 @@ public class DataModelDesc extends RootPersistentEntity {
@JsonProperty("name")
private String name;
+ @JsonProperty("owner")
+ private String owner;
+
@JsonProperty("description")
private String description;
@@ -92,6 +95,14 @@ public class DataModelDesc extends RootPersistentEntity {
this.name = name;
}
+ public String getOwner() {
+ return owner;
+ }
+
+ public void setOwner(String owner) {
+ this.owner = owner;
+ }
+
public String getDescription() {
return description;
}
http://git-wip-us.apache.org/repos/asf/kylin/blob/5e83cd73/webapp/app/js/model/modelsManager.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/model/modelsManager.js b/webapp/app/js/model/modelsManager.js
index 03f0480..c104405 100644
--- a/webapp/app/js/model/modelsManager.js
+++ b/webapp/app/js/model/modelsManager.js
@@ -43,7 +43,15 @@ KylinApp.service('modelsManager',function(ModelService,CubeService,$q,AccessServ
if(model.uuid){
modelPermission.push(
AccessService.list({type: "DataModelDesc", uuid: model.uuid}, function (accessEntities) {
- model.accessEntities = accessEntities;
+ model.accessEntities = accessEntities;
+ try{
+ if(!model.owner){
+ model.owner = accessEntities[0].sid.principal;
+ }
+ } catch(error){
+ $log.error("No acl info.");
+ }
+
}).$promise
)
}
http://git-wip-us.apache.org/repos/asf/kylin/blob/5e83cd73/webapp/app/partials/modelDesigner/model_info.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/modelDesigner/model_info.html b/webapp/app/partials/modelDesigner/model_info.html
index 1e83426..ae8237f 100644
--- a/webapp/app/partials/modelDesigner/model_info.html
+++ b/webapp/app/partials/modelDesigner/model_info.html
@@ -44,6 +44,19 @@
</div>
</div>
+ <!--Model Name-->
+ <div class="form-group middle-popover" ng-if="state.mode=='view'">
+ <div class="row">
+ <label class="col-xs-12 col-sm-3 control-label no-padding-right font-color-default">
+ <b>Owner</b>
+ </label>
+
+ <div class="col-xs-12 col-sm-6">
+ <span ng-if="state.mode=='view'">{{modelsManager.selectedModel.owner}}</span>
+ </div>
+ </div>
+ </div>
+
<!--Description-->
<div class="form-group">
<div class="row">