diff --git a/src/java/azkaban/webapp/servlet/ProjectManagerServlet.java b/src/java/azkaban/webapp/servlet/ProjectManagerServlet.java
index 33ce8f2..10cdaf6 100644
--- a/src/java/azkaban/webapp/servlet/ProjectManagerServlet.java
+++ b/src/java/azkaban/webapp/servlet/ProjectManagerServlet.java
@@ -638,15 +638,20 @@ public class ProjectManagerServlet extends LoginAbstractAzkabanServlet {
}
// Resolve property dependencies
- String source = node.getPropsSource();
- if(source != null) {
- Props parent = flow.getFlowProps(source).getProps();
+ ArrayList<String> source = new ArrayList<String>();
+ String nodeSource = node.getPropsSource();
+ if(nodeSource != null) {
+ source.add(nodeSource);
+ Props parent = flow.getFlowProps(nodeSource).getProps();
while(parent.getParent() != null) {
- source += ( "," + parent.getParent().getSource());
+ source.add(parent.getParent().getSource());
parent = parent.getParent();
}
}
- page.add("properties", source);
+ if(!source.isEmpty()) {
+ page.add("properties", source);
+ }
+
ArrayList<Pair<String,String>> parameters = new ArrayList<Pair<String, String>>();
// Parameter
diff --git a/src/java/azkaban/webapp/servlet/velocity/jobpage.vm b/src/java/azkaban/webapp/servlet/velocity/jobpage.vm
index 5404daf..371bf55 100644
--- a/src/java/azkaban/webapp/servlet/velocity/jobpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/jobpage.vm
@@ -67,7 +67,9 @@
</td></tr>
<tr><td class="first">Properties:</td><td>
#if ($properties)
- <a>$properties</a>
+#foreach($property in $properties)
+ <a>$property</a><span>,</span>
+#end
#else
<span>No Inherited Properties</span>
#end
