From 8c9afff4b989548659dc1dfb0cb771a035722a80 Mon Sep 17 00:00:00 2001 From: Chris Houseknecht Date: Fri, 28 Mar 2014 18:08:48 -0400 Subject: [PATCH] Fixed cancel icon so that it replace delete icon while project is in 'running' state --- awx/ui/static/js/lists/Projects.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/awx/ui/static/js/lists/Projects.js b/awx/ui/static/js/lists/Projects.js index 8e4ad2808a..d34e812fae 100644 --- a/awx/ui/static/js/lists/Projects.js +++ b/awx/ui/static/js/lists/Projects.js @@ -94,12 +94,6 @@ angular.module('ProjectsListDefinition', []) ngClass: "project.scm_type_class", dataPlacement: 'top' }, - cancel: { - ngClick: "cancelUpdate(project.id, project.name)", - awToolTip: 'Cancel the SCM update', - ngShow: "project.status == 'updating'", - dataPlacement: 'top' - }, schedule: { mode: 'all', ngClick: "editSchedules(project.id)", @@ -117,6 +111,12 @@ angular.module('ProjectsListDefinition', []) awToolTip: 'Delete the project', ngShow: "project.status !== 'updating'", dataPlacement: 'top' + }, + cancel: { + ngClick: "cancelUpdate(project.id, project.name)", + awToolTip: 'Cancel the SCM update', + ngShow: "project.status == 'updating'", + dataPlacement: 'top' } } }); \ No newline at end of file