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

Merge pull request #1336 from mabashian/1301-activity-stream-setting

Browse Source 
Added setting name and setting category to activity stream detail modal
This commit is contained in:
Michael Abashian 2018-04-12 14:23:10 -04:00 committed by GitHub
commit 35a75196a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui/client/src/activity-stream/factories/show-detail.factory.js
View File

@ -18,6 +18,8 @@ export default
scope.user = ((activity.summary_fields.actor) ? activity.summary_fields.actor.username : 'system') +
' on ' + $filter('longDate')(activity.timestamp);
scope.operation = activity.description;
scope.settingCategory = _.get(activity, 'summary_fields.setting[0].category');
scope.settingName = _.get(activity, 'summary_fields.setting[0].name');
scope.header = "Event " + activity.id;
scope.variables = ParseVariableString(scope.changes);

2
awx/ui/client/src/activity-stream/streamDetailModal/streamDetailModal.block.less
View File

@ -13,7 +13,7 @@
}
.StreamDetail-inlineRowTitle {
flex: 0 0 110px;
flex: 0 0 125px;
}
.StreamDetail-inlineRowData {

8
awx/ui/client/src/activity-stream/streamDetailModal/streamDetailModal.partial.html
View File

@ -16,6 +16,14 @@
<div class="StreamDetail-rowTitle StreamDetail-inlineRowTitle" translate>ACTION</div>
<div class="StreamDetail-inlineRowData StreamDetail-actions" ng-bind-html="operation"></div>
</div>
<div ng-show="settingCategory" class="StreamDetail-inlineRow">
<div class="StreamDetail-rowTitle StreamDetail-inlineRowTitle" translate>SETTING CATEGORY</div>
<div class="StreamDetail-inlineRowData StreamDetail-actions" ng-bind-html="settingCategory"></div>
</div>
<div ng-show="settingName" class="StreamDetail-inlineRow">
<div class="StreamDetail-rowTitle StreamDetail-inlineRowTitle" translate>SETTING NAME</div>
<div class="StreamDetail-inlineRowData StreamDetail-actions" ng-bind-html="settingName"></div>
</div>
<div ng-show="changes">
<div class="StreamDetail-rowTitle StreamDetail-changesRowTitle" translate>CHANGES</div>
<textarea