shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-11-01 08:21:15 +03:00
Code Releases Activity

Merge pull request #782 from mabashian/configurable-title-badge

Browse Source 
Make title badge a configurable option in the list view
This commit is contained in:
Michael Abashian 2016-02-03 11:31:23 -05:00
commit c9ce546e4b
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
awx/ui/client/src/lists/Streams.js
View File

@ -13,6 +13,7 @@ export default
iterator: 'activity',
editTitle: 'Activity Stream',
listTitle: 'Activity Stream',
listTitleBadge: false,
selectInstructions: '',
index: false,
hover: true,
@ -26,7 +27,8 @@ export default
desc: true,
noLink: true,
searchable: false,
filter: "longDate"
filter: "longDate",
columnClass: 'col-lg-3 col-md-2 col-sm-3 col-xs-3'
},
user: {
label: 'Initiated by',
@ -36,14 +38,15 @@ export default
//awToolTip: "\{\{ userToolTip \}\}",
//dataPlacement: 'top',
searchPlaceholder: 'Username',
searchWidget: 1
searchWidget: 1,
columnClass: 'col-lg-3 col-md-3 col-sm-3 col-xs-3'
},
description: {
label: 'Action',
ngBindHtml: 'activity.description',
nosort: true,
searchable: false,
columnClass: 'col-lg-7'
columnClass: 'col-lg-5 col-md-6 col-sm-4 col-xs-4'
},
actor: {
label: 'System event',
@ -264,6 +267,9 @@ export default
},
fieldActions: {
columnClass: 'col-lg-1 col-md-1 col-sm-2 col-xs-2',
view: {
label: 'View',
ngClick: "showDetail(activity.id)",

6
awx/ui/client/src/shared/list-generator/list-generator.factory.js
View File

@ -306,7 +306,11 @@ export default ['$location', '$compile', '$rootScope', 'SearchWidget', 'Paginate
if (list.listTitle) {
html += "<div class=\"List-titleText\">" + list.listTitle + "</div>";
html += "<span class=\"badge List-titleBadge\">{{(" + list.iterator + "_total_rows | number:0)}}</span>";
// We want to show the list title badge by default and only hide it when the list config specifically passes a false flag
list.listTitleBadge = (typeof list.listTitleBadge === 'boolean' && list.listTitleBadge == false) ? false : true;
if(list.listTitleBadge) {
html += "<span class=\"badge List-titleBadge\">{{(" + list.iterator + "_total_rows | number:0)}}</span>";
}
}