luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Clean up root check

This commit is contained in:
William Tisäter 2014-05-05 02:58:27 +02:00 committed by William Tisäter
parent e174d1062c
commit a730174f0c
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ui/javascripts/app/controllers.js
View File

@ -174,11 +174,8 @@ App.KvEditController = Ember.Controller.extend({
var controller = this;
var dc = controller.get('dc').get('datacenter');
var key = controller.get("model");
var parent = key.get('parentKey');
if (parent === '/') {
parent = controller.get('rootKey');
}
var isRoot = controller.get('isRoot');
var parent = isRoot ? controller.get('rootKey') : key.get('parentKey');
// Delete the key
Ember.$.ajax({

9
ui/javascripts/app/routes.js
View File

@ -19,7 +19,11 @@ App.BaseRoute = Ember.Route.extend({
grandParentKey = parts.join("/") + "/";
}
return {grandParent: grandParentKey, parent: parentKey}
return {
parent: parentKey,
grandParent: grandParentKey,
isRoot: parentKey === '/'
}
},
removeDuplicateKeys: function(keys, matcher) {
@ -131,7 +135,7 @@ App.KvShowRoute = App.BaseRoute.extend({
controller.set('content', models.keys);
controller.set('parentKey', parentKeys.parent);
controller.set('grandParentKey', parentKeys.grandParent);
controller.set('isRoot', parentKeys.parent === '/');
controller.set('isRoot', parentKeys.isRoot);
controller.set('newKey', App.Key.create());
}
});
@ -168,6 +172,7 @@ App.KvEditRoute = App.BaseRoute.extend({
controller.set('grandParentKey', parentKeys.grandParent);
controller.set('siblings', models.keys);
controller.set('rootKey', this.rootKey);
controller.set('isRoot', parentKeys.isRoot);
}
});