External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-19 09:57:33 -02:30
Code Issues Packages Projects Releases Wiki Activity

Added setting name and setting category to activity stream detail modal

Browse Source
This commit is contained in:
mabashian
2018-04-11 13:21:06 -04:00
parent c936fd7035
commit 6757f5bbe5
3 changed files with 11 additions and 1 deletions
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') + scope.user = ((activity.summary_fields.actor) ? activity.summary_fields.actor.username : 'system') +
' on ' + $filter('longDate')(activity.timestamp); ' on ' + $filter('longDate')(activity.timestamp);
scope.operation = activity.description; 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.header = "Event " + activity.id;
scope.variables = ParseVariableString(scope.changes); scope.variables = ParseVariableString(scope.changes);

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

@@ -13,7 +13,7 @@
} }
.StreamDetail-inlineRowTitle { .StreamDetail-inlineRowTitle {
flex: 0 0 110px; flex: 0 0 125px;
} }
.StreamDetail-inlineRowData { .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-rowTitle StreamDetail-inlineRowTitle" translate>ACTION</div>
<div class="StreamDetail-inlineRowData StreamDetail-actions" ng-bind-html="operation"></div> <div class="StreamDetail-inlineRowData StreamDetail-actions" ng-bind-html="operation"></div>
</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 ng-show="changes">
<div class="StreamDetail-rowTitle StreamDetail-changesRowTitle" translate>CHANGES</div> <div class="StreamDetail-rowTitle StreamDetail-changesRowTitle" translate>CHANGES</div>
<textarea <textarea