External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-12 18:40:01 -03:30
Code Issues Packages Projects Releases Wiki Activity

Event viewer- ignore jinja variables

Browse Source 
Brought forward change from 1.4.11 to keep angular from attempting to bind to jinja vars that might appear in task names or pre formated output. Removed use of transparent background from jqueryui overrides.
This commit is contained in:
Chris Houseknecht 2014-07-22 13:27:30 -04:00
parent 49b10765b8
commit e6b738e177
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
awx/ui/static/js/helpers/EventViewer.js
View File

@ -146,7 +146,6 @@ angular.module('EventViewerHelper', ['ModalDialog', 'Utilities', 'EventsViewerFo
scope.removeEventReady = scope.$on('EventReady', function(e, data) {
var btns;
scope.events = data;
// find and show the selected event
data.every(function(row, idx) {
if (parseInt(row.id,10) === parseInt(event_id,10)) {
@ -412,7 +411,7 @@ angular.module('EventViewerHelper', ['ModalDialog', 'Utilities', 'EventsViewerFo
">" + obj[key] + "</a>";
}
else {
html += obj[key];
html += "<span ng-non-bindable>" + obj[key] + "</span>";
}
html += "</td></tr>\n";
@ -454,7 +453,7 @@ angular.module('EventViewerHelper', ['ModalDialog', 'Utilities', 'EventsViewerFo
fld_id = params.fld_id,
html;
html = "<div class=\"form-group\">\n" +
"<textarea id=\"" + fld_id + "\" class=\"form-control mono-space\" rows=\"12\" readonly>" + val + "</textarea>" +
"<textarea ng-non-bindable id=\"" + fld_id + "\" class=\"form-control mono-space\" rows=\"12\" readonly>" + val + "</textarea>" +
"</div>\n";
$('#' + container_id).empty().html(html);
};
@ -465,7 +464,7 @@ angular.module('EventViewerHelper', ['ModalDialog', 'Utilities', 'EventsViewerFo
var id = params.id,
val = params.val,
html;
html = "<pre>" + val + "</pre>\n";
html = "<pre ng-non-bindable>" + val + "</pre>\n";
$('#' + id).empty().html(html);
};
}]);

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

@ -346,7 +346,7 @@ angular.module('LogViewerHelper', ['ModalDialog', 'Utilities', 'FormGenerator',
fld_id = params.fld_id,
html;
html = "<div class=\"form-group\">\n" +
"<textarea id=\"" + fld_id + "\" class=\"form-control mono-space\" rows=\"12\" readonly>" + val + "</textarea>" +
"<textarea id=\"" + fld_id + "\" ng-non-bindable class=\"form-control mono-space\" rows=\"12\" readonly>" + val + "</textarea>" +
"</div>\n";
$('#' + container_id).empty().html(html);
};
@ -357,7 +357,7 @@ angular.module('LogViewerHelper', ['ModalDialog', 'Utilities', 'FormGenerator',
var id = params.id,
val = params.val,
html;
html = "<pre>" + val + "</pre>\n";
html = "<pre ng-non-bindable>" + val + "</pre>\n";
$('#' + id).empty().html(html);
};
}])
@ -370,7 +370,7 @@ angular.module('LogViewerHelper', ['ModalDialog', 'Utilities', 'FormGenerator',
html = "<table class=\"table logviewer-status\">\n";
for (key in vars) {
html += "<tr><td class=\"fld-label col-md-4 col-sm-3 col-xs-3 break\">" + key + "</td>" +
"<td class=\"break\">" + vars[key] + "</td></tr>\n";
"<td ng-non-bindable class=\"break\">" + vars[key] + "</td></tr>\n";
}
html += "</table>\n";
$('#' + id).empty().html(html);

4
awx/ui/static/less/jquery-ui-overrides.less
View File

@ -91,7 +91,7 @@ table.ui-datepicker-calendar {
.ui-widget-content {
background-image: none;
background-color: transparent;
background-color: @white;
a,
a:visited,
@ -127,7 +127,7 @@ table.ui-datepicker-calendar {
.ui-state-active,
.ui-state-default {
background-image: none;
background-color: transparent;
background-color: @white;
border: 1px solid @well-border;
}