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

Fixing various audit bugs

Browse Source
This commit is contained in:
Ken Hoes 2017-01-09 09:03:20 -05:00
parent 8847110c23
commit eeebf2ddf8
12 changed files with 23 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,5 +35,6 @@
margin-bottom: 0;
max-height: 200px;
overflow: scroll;
overflow-x: auto;
color: @as-detail-changes-txt;
}

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

@ -22,7 +22,7 @@
</div>
</div>
<div class="Modal-footer">
<a href="#" data-target="#stream-detail-modal" data-dismiss="modal" id="action_cancel_btn" class="btn btn-primary StreamDetail-actionButton">OK</a>
<a href="#" data-target="#stream-detail-modal" data-dismiss="modal" id="action_cancel_btn" class="btn btn-default StreamDetail-actionButton">OK</a>
</div>
</div>
</div>

19
awx/ui/client/src/dashboard/lists/dashboard-list.block.less
View File

@ -32,34 +32,21 @@
}
.DashboardList-viewAll {
color: @btn-txt;
background-color: @btn-bg;
font-size: 12px;
border: 1px solid @default-icon-hov;
border-radius: 5px;
font-size: 11px;
margin-right: 15px;
margin-top: 10px;
margin-top: 13px;
margin-bottom: 10px;
padding-left: 10px;
padding-right: 10px;
padding-bottom: 5px;
padding-top: 5px;
transition: background-color 0.2s;
}
.DashboardList-viewAll:hover {
color: @btn-txt;
background-color: @btn-bg-hov;
}
.DashboardList-viewAll:focus {
color: @btn-txt;
}
.DashboardList-container {
flex: 1;
width: 100%;
padding: 20px;
padding-top: 0;
}
.DashboardList-tableHeader--name {

2
awx/ui/client/src/forms/Groups.js
View File

@ -43,7 +43,7 @@ export default
label: 'Variables',
type: 'textarea',
class: 'Form-textAreaLabel Form-formGroup--fullWidth',
rows: 12,
rows: 6,
'default': '---',
dataTitle: 'Group Variables',
dataPlacement: 'right',

2
awx/ui/client/src/forms/Inventories.js
View File

@ -78,7 +78,7 @@ angular.module('InventoryFormDefinition', ['ScanJobsListDefinition'])
},
close: {
ngClick: 'formCancel()',
ngHide: '(inventory_obj.summary_fields.user_capabilities.edit || canAdd)'
ngShow: '!(inventory_obj.summary_fields.user_capabilities.edit || canAdd)'
},
save: {
ngClick: 'formSave()',

2
awx/ui/client/src/helpers/Jobs.js
View File

@ -233,7 +233,7 @@ export default
hdr: hdr,
body: (action_label === 'cancel' || job.status === 'new') ? cancelBody : deleteBody,
action: action,
actionText: (action_label === 'cancel' || job.status === 'new') ? "YES" : "DELETE"
actionText: (action_label === 'cancel' || job.status === 'new') ? "OK" : "DELETE"
});
});

10
awx/ui/client/src/inventories/add/inventory-add.controller.js
View File

@ -11,10 +11,16 @@
*/
function InventoriesAdd($scope, $rootScope, $compile, $location, $log,
$stateParams, GenerateForm, InventoryForm, Rest, Alert, ProcessErrors,
$stateParams, GenerateForm, InventoryForm, rbacUiControlService, Rest, Alert, ProcessErrors,
ClearScope, GetBasePath, ParseTypeChange, Wait, ToJSON,
$state) {
$scope.canAdd = false;
rbacUiControlService.canAdd(GetBasePath('inventory'))
.then(function(canAdd) {
$scope.canAdd = canAdd;
});
Rest.setUrl(GetBasePath('inventory'));
Rest.options()
.success(function(data) {
@ -91,7 +97,7 @@ function InventoriesAdd($scope, $rootScope, $compile, $location, $log,
}
export default ['$scope', '$rootScope', '$compile', '$location',
'$log', '$stateParams', 'GenerateForm', 'InventoryForm', 'Rest', 'Alert',
'$log', '$stateParams', 'GenerateForm', 'InventoryForm', 'rbacUiControlService', 'Rest', 'Alert',
'ProcessErrors', 'ClearScope', 'GetBasePath', 'ParseTypeChange',
'Wait', 'ToJSON', '$state', InventoriesAdd
];

2
awx/ui/client/src/inventories/edit/inventory-edit.controller.js
View File

@ -32,7 +32,7 @@ function InventoriesEdit($scope, $rootScope, $compile, $location,
form.formFieldSize = null;
$scope.inventory_id = inventory_id;
$scope.$watch('invnentory_obj.summary_fields.user_capabilities.edit', function(val) {
$scope.$watch('inventory_obj.summary_fields.user_capabilities.edit', function(val) {
if (val === false) {
$scope.canAdd = false;
}

2
awx/ui/client/src/lists/AllJobs.js
View File

@ -16,6 +16,8 @@ export default
index: false,
hover: true,
well: false,
title: false,
fields: {
status: {
label: '',

4
awx/ui/client/src/lists/Projects.js
View File

@ -42,14 +42,14 @@ export default
scm_revision: {
label: i18n._('Revision'),
excludeModal: true,
columnClass: 'col-lg-3 col-md-2 col-sm-3 hidden-xs',
columnClass: 'col-lg-4 col-md-2 col-sm-3 hidden-xs',
class: 'List-staticColumnAdjacent--monospace'
},
scm_type: {
label: i18n._('Type'),
ngBind: 'project.type_label',
excludeModal: true,
columnClass: 'col-lg-3 col-md-2 col-sm-3 hidden-xs'
columnClass: 'col-lg-2 col-md-2 col-sm-3 hidden-xs'
},
last_updated: {
label: i18n._('Last Updated'),

2
awx/ui/client/src/partials/jobs.html
View File

@ -16,7 +16,7 @@
</button>
</div>
</div>
<div ui-view='list'></div>
<div ui-view="list"></div>
</div>
</div>
<div ng-include="'/static/partials/logviewer.html'"></div>

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

@ -134,7 +134,7 @@ export default ['$location', '$compile', '$rootScope', 'Attr', 'Icon',
base, action, fld, cnt, field_action, fAction, itm;
if (options.mode !== 'lookup') {
if (options.title !== false) {
if (options.title !== false && list.title !== false) {
html += "<div class=\"List-header\">";
html += "<div class=\"List-title\">";