From 9efa5e28ce820256bfba93fd19beff434484e1a3 Mon Sep 17 00:00:00 2001
From: Chris Houseknecht <chouse@ansible.com>
Date: Tue, 1 Apr 2014 12:57:34 -0400
Subject: [PATCH] Fixed project status mismatch.

---
 awx/ui/static/js/controllers/Projects.js | 2 +-
 awx/ui/static/js/lists/Projects.js       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/awx/ui/static/js/controllers/Projects.js b/awx/ui/static/js/controllers/Projects.js
index 6c58166da3..6c92171d33 100644
--- a/awx/ui/static/js/controllers/Projects.js
+++ b/awx/ui/static/js/controllers/Projects.js
@@ -337,7 +337,7 @@ function ProjectsList ($scope, $rootScope, $location, $log, $routeParams, Rest,
                     // Do not respond. Button appears greyed out as if it is disabled. Not disabled though, because we need mouse over event
                     // to work. So user can click, but we just won't do anything.
                     //Alert('Missing SCM Setup', 'Before running an SCM update, edit the project and provide the SCM access information.', 'alert-info');
-                } else if (project.status === 'updating') {
+                } else if (project.status === 'updating' || project.status === 'running') {
                     Alert('Update in Progress', 'The SCM update process is running. Use the Refresh button to monitor the status.', 'alert-info');
                 } else {
                     ProjectUpdate({ scope: $scope, project_id: project.id });
diff --git a/awx/ui/static/js/lists/Projects.js b/awx/ui/static/js/lists/Projects.js
index d34e812fae..30ed52b55e 100644
--- a/awx/ui/static/js/lists/Projects.js
+++ b/awx/ui/static/js/lists/Projects.js
@@ -109,13 +109,13 @@ angular.module('ProjectsListDefinition', [])
             "delete": {
                 ngClick: "deleteProject(project.id, project.name)",
                 awToolTip: 'Delete the project',
-                ngShow: "project.status !== 'updating'",
+                ngShow: "project.status !== 'updating' && project.status !== 'running'",
                 dataPlacement: 'top'
             },
             cancel: {
                 ngClick: "cancelUpdate(project.id, project.name)",
                 awToolTip: 'Cancel the SCM update',
-                ngShow: "project.status == 'updating'",
+                ngShow: "project.status == 'updating' || project.status == 'running'",
                 dataPlacement: 'top'
             }
         }