This closes #42
diff --git a/src/main/webapp/assets/js/view/editor.js b/src/main/webapp/assets/js/view/editor.js
index 53f12f3..5d10100 100644
--- a/src/main/webapp/assets/js/view/editor.js
+++ b/src/main/webapp/assets/js/view/editor.js
@@ -335,7 +335,30 @@
if(succeeded){
log("Submit [succeeded] ... redirecting back to " + type);
if(type && type === 'catalog'){
- Backbone.history.navigate('v1/catalog', {trigger: true});
+ var firstItem;
+ var keys = _.keys(data);
+ if (keys.length > 0) {
+ firstItem = data[keys[0]];
+ }
+ var url = 'v1/catalog';
+ if (firstItem) {
+ switch (firstItem.itemType) {
+ case 'template':
+ url += '/applications';
+ break;
+ case 'entity':
+ url += '/entities';
+ break;
+ case 'policy':
+ url += '/policies';
+ break;
+ case 'location':
+ url += '/locations';
+ break;
+ }
+ url += '/' + firstItem.id;
+ }
+ Backbone.history.navigate(url, {trigger: true});
}else{
// no need to refresh apps (this.collection) because homePage route does that
Backbone.history.navigate('v1/home', {trigger: true});