diff --git a/.gitignore b/.gitignore index 43ab47988b..f181382323 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ awx/settings/local_settings.py* awx/*.sqlite3 +awx/job_status awx/projects awx/job_output awx/public/media diff --git a/awx/ui/static/js/forms/LogViewerStatus.js b/awx/ui/static/js/forms/LogViewerStatus.js index 511b71fee3..51a9fd361b 100644 --- a/awx/ui/static/js/forms/LogViewerStatus.js +++ b/awx/ui/static/js/forms/LogViewerStatus.js @@ -18,6 +18,16 @@ angular.module('LogViewerStatusDefinition', []) type: "text", readonly: true, }, + "status": { + label: "Status", + type: "text", + readonly: true + }, + "license_error": { + label: "License Error", + type: "text", + readonly: true + }, "started": { label: "Started", type: "text", @@ -37,16 +47,6 @@ angular.module('LogViewerStatusDefinition', []) label: "Launch Type", type: "text", readonly: true - }, - "status": { - label: "Status", - type: "text", - readonly: true - }, - "license_error": { - label: "License Error", - type: "text", - readonly: true } } diff --git a/awx/ui/static/js/helpers/Jobs.js b/awx/ui/static/js/helpers/Jobs.js index 5c03c22499..14ea1bf153 100644 --- a/awx/ui/static/js/helpers/Jobs.js +++ b/awx/ui/static/js/helpers/Jobs.js @@ -73,7 +73,6 @@ angular.module('JobsHelper', ['Utilities', 'RestServices', 'FormGenerator', 'Job scope.viewJobLog = function(id, url) { var list, job; if (url) { - console.log(url); $location.url(url); } else { diff --git a/awx/ui/static/js/helpers/LogViewer.js b/awx/ui/static/js/helpers/LogViewer.js index 95f0a6872d..3fe457be17 100644 --- a/awx/ui/static/js/helpers/LogViewer.js +++ b/awx/ui/static/js/helpers/LogViewer.js @@ -41,6 +41,7 @@ angular.module('LogViewerHelper', ['ModalDialog', 'Utilities', 'FormGenerator', AddTable({ scope: scope, form: LogViewerOptionsForm, id: 'options-form-container', getIcon: getIcon }); if (data.result_stdout) { + $('#logview-tabs li:eq(1)').show(); AddPreFormattedText({ id: 'stdout-form-container', val: data.result_stdout @@ -51,6 +52,7 @@ angular.module('LogViewerHelper', ['ModalDialog', 'Utilities', 'FormGenerator', } if (data.result_traceback) { + $('#logview-tabs li:eq(2)').show(); AddPreFormattedText({ id: 'traceback-form-container', val: data.result_traceback @@ -236,12 +238,16 @@ angular.module('LogViewerHelper', ['ModalDialog', 'Utilities', 'FormGenerator', else if (fld === 'elapsed') { html += scope[fld] + " seconds"; } - else if (getIcon && fld === 'status') { - html += " " + scope[fld]; - //html += " " + scope[fld]; - } else if (fld === 'status') { - html += " " + scope[fld]; + if (getIcon) { + html += " " + scope[fld]; + } + else { + html += " " + scope[fld]; + } + if (scope.job_explanation) { + html += "
" + scope.job_explanation + "
"; + } } else { html += scope[fld];