You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by tb...@apache.org on 2015/01/23 17:43:29 UTC
ambari git commit: AMBARI-9301 - Views: edit view instance not
working (tbeerbower)
Repository: ambari
Updated Branches:
refs/heads/trunk 5d5fcaa81 -> e5622e26a
AMBARI-9301 - Views: edit view instance not working (tbeerbower)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e5622e26
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e5622e26
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e5622e26
Branch: refs/heads/trunk
Commit: e5622e26a64f062b83347bd9bb64015470db2114
Parents: 5d5fcaa
Author: tbeerbower <tb...@hortonworks.com>
Authored: Fri Jan 23 11:39:13 2015 -0500
Committer: tbeerbower <tb...@hortonworks.com>
Committed: Fri Jan 23 11:39:13 2015 -0500
----------------------------------------------------------------------
.../java/org/apache/ambari/server/view/ViewRegistry.java | 3 +++
.../org/apache/ambari/server/view/ViewRegistryTest.java | 9 +++++++++
2 files changed, 12 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/e5622e26/ambari-server/src/main/java/org/apache/ambari/server/view/ViewRegistry.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewRegistry.java b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewRegistry.java
index e422a46..db24954 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewRegistry.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewRegistry.java
@@ -1197,6 +1197,9 @@ public class ViewRegistry {
// sync a given view instance entity with another given view instance entity
private void syncViewInstance(ViewInstanceEntity instance1, ViewInstanceEntity instance2) {
+ instance1.setLabel(instance2.getLabel());
+ instance1.setDescription(instance2.getDescription());
+ instance1.setVisible(instance2.isVisible());
instance1.setResource(instance2.getResource());
instance1.setViewInstanceId(instance2.getViewInstanceId());
instance1.setData(instance2.getData());
http://git-wip-us.apache.org/repos/asf/ambari/blob/e5622e26/ambari-server/src/test/java/org/apache/ambari/server/view/ViewRegistryTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/view/ViewRegistryTest.java b/ambari-server/src/test/java/org/apache/ambari/server/view/ViewRegistryTest.java
index 14dd4cf..3a1c4eb 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/view/ViewRegistryTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/view/ViewRegistryTest.java
@@ -930,6 +930,12 @@ public class ViewRegistryTest {
registry.addDefinition(viewEntity);
registry.installViewInstance(viewInstanceEntity);
+ Assert.assertTrue(viewInstanceEntity.isVisible());
+
+ updateInstance.setLabel("new label");
+ updateInstance.setDescription("new description");
+ updateInstance.setVisible(false);
+
registry.updateViewInstance(updateInstance);
Collection<ViewInstanceEntity> viewInstanceDefinitions = registry.getInstanceDefinitions(viewEntity);
@@ -938,6 +944,9 @@ public class ViewRegistryTest {
ViewInstanceEntity instanceEntity = viewInstanceDefinitions.iterator().next();
Assert.assertEquals("v2-1", instanceEntity.getProperty("p2").getValue() );
+ Assert.assertEquals("new label", instanceEntity.getLabel() );
+ Assert.assertEquals("new description", instanceEntity.getDescription() );
+ Assert.assertFalse(instanceEntity.isVisible());
Assert.assertEquals(viewInstanceEntity, viewInstanceDefinitions.iterator().next());