From 22221ece16eea2fe01e8e767411a9cc564d2b863 Mon Sep 17 00:00:00 2001 From: Brian Federle Date: Thu, 5 Apr 2012 13:24:16 -0700 Subject: [PATCH] Projects UI Fix issue where removing project didn't remove detail view --- ui/scripts/projects.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ui/scripts/projects.js b/ui/scripts/projects.js index cf86ed49af0..233fecb1ec4 100644 --- a/ui/scripts/projects.js +++ b/ui/scripts/projects.js @@ -713,7 +713,7 @@ notification: { poll: pollAsyncJobResult } }, - destroy: { + remove: { label: 'label.delete.project', action: function(args) { $.ajax({ @@ -806,7 +806,8 @@ }, success: function(json) { args.response.success({ - data: json.listprojectsresponse.project[0], + data: json.listprojectsresponse.project ? + json.listprojectsresponse.project[0] : {}, actionFilter: projectsActionFilter }); } @@ -1014,7 +1015,7 @@ }; var projectsActionFilter = function(args) { - var allowedActions = ['destroy', 'edit']; + var allowedActions = ['remove', 'edit']; if (args.context.item.account == cloudStack.context.users[0].account || isAdmin() || isDomainAdmin()) {