1
0
mirror of https://github.com/ansible/awx.git synced 2024-11-02 09:51:09 +03:00

specifically bind html only the row items that need it for new lists in the ui

This commit is contained in:
John Mitchell 2018-04-23 16:57:43 -04:00
parent 0de88d6566
commit 9cfd264103
No known key found for this signature in database
GPG Key ID: FE6A9B5BD4EB5C94
3 changed files with 7 additions and 3 deletions

View File

@ -77,11 +77,11 @@
</at-row-item> </at-row-item>
<at-row-item <at-row-item
label-value="{{:: vm.strings.get('list.ROW_ITEM_LABEL_MODIFIED') }}" label-value="{{:: vm.strings.get('list.ROW_ITEM_LABEL_MODIFIED') }}"
value="{{ vm.getModified(template) }}"> value-bind-html="{{ vm.getModified(template) }}">
</at-row-item> </at-row-item>
<at-row-item <at-row-item
label-value="{{:: vm.strings.get('list.ROW_ITEM_LABEL_RAN') }}" label-value="{{:: vm.strings.get('list.ROW_ITEM_LABEL_RAN') }}"
value="{{ vm.getLastRan(template) }}"> value-bind-html="{{ vm.getLastRan(template) }}">
</at-row-item> </at-row-item>
<labels-list class="LabelList" show-delete="false" is-row-item="true" state="template"> <labels-list class="LabelList" show-delete="false" is-row-item="true" state="template">
</labels-list> </labels-list>

View File

@ -19,6 +19,7 @@ function atRowItem () {
labelState: '@', labelState: '@',
value: '@', value: '@',
valueLink: '@', valueLink: '@',
valueBindHtml: '@',
smartStatus: '=?', smartStatus: '=?',
tagValues: '=?', tagValues: '=?',
// TODO: add see more for tags if applicable // TODO: add see more for tags if applicable

View File

@ -1,5 +1,5 @@
<div class="at-RowItem" ng-class="{'at-RowItem--isHeader': headerValue, 'at-RowItem--inline': inline}" <div class="at-RowItem" ng-class="{'at-RowItem--isHeader': headerValue, 'at-RowItem--inline': inline}"
ng-show="status || headerValue || value || (smartStatus && smartStatus.summary_fields.recent_jobs.length) || (tagValues && tagValues.length)"> ng-show="status || headerValue || value || valueBindHtml || (smartStatus && smartStatus.summary_fields.recent_jobs.length) || (tagValues && tagValues.length)">
<div class="at-RowItem-status" ng-if="status"> <div class="at-RowItem-status" ng-if="status">
<a ng-if="headerLink" ng-href="{{ headerLink }}" <a ng-if="headerLink" ng-href="{{ headerLink }}"
aw-tool-tip="{{ statusTip }}" aw-tip-watch="statusTip" aw-tool-tip="{{ statusTip }}" aw-tip-watch="statusTip"
@ -32,6 +32,9 @@
<div class="at-RowItem-value" ng-class="{'at-RowItem-badge': badge}" ng-if="value && !valueLink" <div class="at-RowItem-value" ng-class="{'at-RowItem-badge': badge}" ng-if="value && !valueLink"
ng-bind-html="value"> ng-bind-html="value">
</div> </div>
<div class="at-RowItem-value" ng-class="{'at-RowItem-badge': badge}" ng-if="valueBindHtml"
ng-bind-html="valueBindHtml">
</div>
<aw-smart-status jobs="smartStatus.summary_fields.recent_jobs" <aw-smart-status jobs="smartStatus.summary_fields.recent_jobs"
template-type="smartStatus.type" ng-if="smartStatus"> template-type="smartStatus.type" ng-if="smartStatus">
</aw-smart-status> </aw-smart-status>