shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-11-01 08:21:15 +03:00
Code Releases Activity

Job detail page

Browse Source 
Fixed https://trello.com/c/JW7zmAsD/312-job-detail-duplicate-tasks-listed-when-double-clicking-a-play
This commit is contained in:
Chris Houseknecht 2014-08-15 23:02:47 -04:00
parent e25778d0ed
commit 5bc8255d8f
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
awx/ui/static/js/helpers/JobDetail.js
View File

@ -712,6 +712,7 @@ function($rootScope, $log, UpdatePlayStatus, UpdateHostStatus, AddHostResult, Ge
Rest.get() Rest.get()
.success(function(data) { .success(function(data) {
scope.next_plays = data.next; scope.next_plays = data.next;
scope.plays = [];
data.results.forEach(function(event, idx) { data.results.forEach(function(event, idx) {
var status, status_text, start, end, elapsed; var status, status_text, start, end, elapsed;
@ -801,7 +802,6 @@ function($rootScope, $log, UpdatePlayStatus, UpdateHostStatus, AddHostResult, Ge
url, play; url, play;
scope.tasks = []; scope.tasks = [];
scope.tasksMap = {};
if (scope.selectedPlay) { if (scope.selectedPlay) {
url = scope.job.url + 'job_tasks/?event_id=' + scope.selectedPlay; url = scope.job.url + 'job_tasks/?event_id=' + scope.selectedPlay;
@ -823,6 +823,7 @@ function($rootScope, $log, UpdatePlayStatus, UpdateHostStatus, AddHostResult, Ge
Rest.get() Rest.get()
.success(function(data) { .success(function(data) {
scope.next_tasks = data.next; scope.next_tasks = data.next;
scope.tasks = [];
data.results.forEach(function(event, idx) { data.results.forEach(function(event, idx) {
var end, elapsed, status, status_text; var end, elapsed, status, status_text;
@ -948,7 +949,6 @@ function($rootScope, $log, UpdatePlayStatus, UpdateHostStatus, AddHostResult, Ge
url; url;
scope.hostResults = []; scope.hostResults = [];
scope.hostResultsMap = {};
if (scope.selectedTask) { if (scope.selectedTask) {
// If we have a selected task, then get the list of hosts // If we have a selected task, then get the list of hosts
@ -961,6 +961,7 @@ function($rootScope, $log, UpdatePlayStatus, UpdateHostStatus, AddHostResult, Ge
Rest.get() Rest.get()
.success(function(data) { .success(function(data) {
scope.next_host_results = data.next; scope.next_host_results = data.next;
scope.hostResults = [];
data.results.forEach(function(event) { data.results.forEach(function(event) {
var status, status_text, item, msg; var status, status_text, item, msg;
if (event.event === "runner_on_skipped") { if (event.event === "runner_on_skipped") {
@ -1060,6 +1061,7 @@ function($rootScope, $log, UpdatePlayStatus, UpdateHostStatus, AddHostResult, Ge
Rest.get() Rest.get()
.success(function(data) { .success(function(data) {
scope.next_host_summaries = data.next; scope.next_host_summaries = data.next;
scope.hosts = [];
data.results.forEach(function(event) { data.results.forEach(function(event) {
var name; var name;
if (event.host_name) { if (event.host_name) {

2
awx/ui/static/less/ansible-ui.less
View File

@ -7,7 +7,7 @@
* *
*/ */
@active-color: #c6e5e5; @active-color: #EDF2F2; // #c6e5e5;
@black: #171717; @black: #171717;
@blue: #1778c3; /* logo blue */ @blue: #1778c3; /* logo blue */
@blue-link: #1778c3; @blue-link: #1778c3;

2
awx/ui/static/less/job-details.less
View File

@ -293,7 +293,7 @@
border: none; border: none;
} }
.active { .active {
background-color: #EDF2F2; background-color: @active-color;
} }
.loading-info { .loading-info {
padding-top: 5px; padding-top: 5px;