mirror of
https://github.com/ansible/awx.git
synced 2026-02-12 15:14:45 -03:30
Fixing various audit bugs
This commit is contained in:
@@ -35,5 +35,6 @@
|
|||||||
margin-bottom: 0;
|
margin-bottom: 0;
|
||||||
max-height: 200px;
|
max-height: 200px;
|
||||||
overflow: scroll;
|
overflow: scroll;
|
||||||
|
overflow-x: auto;
|
||||||
color: @as-detail-changes-txt;
|
color: @as-detail-changes-txt;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -22,7 +22,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="Modal-footer">
|
<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>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -32,34 +32,21 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.DashboardList-viewAll {
|
.DashboardList-viewAll {
|
||||||
color: @btn-txt;
|
font-size: 11px;
|
||||||
background-color: @btn-bg;
|
|
||||||
font-size: 12px;
|
|
||||||
border: 1px solid @default-icon-hov;
|
|
||||||
border-radius: 5px;
|
|
||||||
margin-right: 15px;
|
margin-right: 15px;
|
||||||
margin-top: 10px;
|
margin-top: 13px;
|
||||||
margin-bottom: 10px;
|
margin-bottom: 10px;
|
||||||
padding-left: 10px;
|
padding-left: 10px;
|
||||||
padding-right: 10px;
|
padding-right: 10px;
|
||||||
padding-bottom: 5px;
|
padding-bottom: 5px;
|
||||||
padding-top: 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 {
|
.DashboardList-container {
|
||||||
flex: 1;
|
flex: 1;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
padding: 20px;
|
padding: 20px;
|
||||||
|
padding-top: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.DashboardList-tableHeader--name {
|
.DashboardList-tableHeader--name {
|
||||||
|
|||||||
@@ -43,7 +43,7 @@ export default
|
|||||||
label: 'Variables',
|
label: 'Variables',
|
||||||
type: 'textarea',
|
type: 'textarea',
|
||||||
class: 'Form-textAreaLabel Form-formGroup--fullWidth',
|
class: 'Form-textAreaLabel Form-formGroup--fullWidth',
|
||||||
rows: 12,
|
rows: 6,
|
||||||
'default': '---',
|
'default': '---',
|
||||||
dataTitle: 'Group Variables',
|
dataTitle: 'Group Variables',
|
||||||
dataPlacement: 'right',
|
dataPlacement: 'right',
|
||||||
|
|||||||
@@ -78,7 +78,7 @@ angular.module('InventoryFormDefinition', ['ScanJobsListDefinition'])
|
|||||||
},
|
},
|
||||||
close: {
|
close: {
|
||||||
ngClick: 'formCancel()',
|
ngClick: 'formCancel()',
|
||||||
ngHide: '(inventory_obj.summary_fields.user_capabilities.edit || canAdd)'
|
ngShow: '!(inventory_obj.summary_fields.user_capabilities.edit || canAdd)'
|
||||||
},
|
},
|
||||||
save: {
|
save: {
|
||||||
ngClick: 'formSave()',
|
ngClick: 'formSave()',
|
||||||
|
|||||||
@@ -233,7 +233,7 @@ export default
|
|||||||
hdr: hdr,
|
hdr: hdr,
|
||||||
body: (action_label === 'cancel' || job.status === 'new') ? cancelBody : deleteBody,
|
body: (action_label === 'cancel' || job.status === 'new') ? cancelBody : deleteBody,
|
||||||
action: action,
|
action: action,
|
||||||
actionText: (action_label === 'cancel' || job.status === 'new') ? "YES" : "DELETE"
|
actionText: (action_label === 'cancel' || job.status === 'new') ? "OK" : "DELETE"
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -11,10 +11,16 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
function InventoriesAdd($scope, $rootScope, $compile, $location, $log,
|
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,
|
ClearScope, GetBasePath, ParseTypeChange, Wait, ToJSON,
|
||||||
$state) {
|
$state) {
|
||||||
|
|
||||||
|
$scope.canAdd = false;
|
||||||
|
rbacUiControlService.canAdd(GetBasePath('inventory'))
|
||||||
|
.then(function(canAdd) {
|
||||||
|
$scope.canAdd = canAdd;
|
||||||
|
});
|
||||||
|
|
||||||
Rest.setUrl(GetBasePath('inventory'));
|
Rest.setUrl(GetBasePath('inventory'));
|
||||||
Rest.options()
|
Rest.options()
|
||||||
.success(function(data) {
|
.success(function(data) {
|
||||||
@@ -91,7 +97,7 @@ function InventoriesAdd($scope, $rootScope, $compile, $location, $log,
|
|||||||
}
|
}
|
||||||
|
|
||||||
export default ['$scope', '$rootScope', '$compile', '$location',
|
export default ['$scope', '$rootScope', '$compile', '$location',
|
||||||
'$log', '$stateParams', 'GenerateForm', 'InventoryForm', 'Rest', 'Alert',
|
'$log', '$stateParams', 'GenerateForm', 'InventoryForm', 'rbacUiControlService', 'Rest', 'Alert',
|
||||||
'ProcessErrors', 'ClearScope', 'GetBasePath', 'ParseTypeChange',
|
'ProcessErrors', 'ClearScope', 'GetBasePath', 'ParseTypeChange',
|
||||||
'Wait', 'ToJSON', '$state', InventoriesAdd
|
'Wait', 'ToJSON', '$state', InventoriesAdd
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ function InventoriesEdit($scope, $rootScope, $compile, $location,
|
|||||||
form.formFieldSize = null;
|
form.formFieldSize = null;
|
||||||
$scope.inventory_id = inventory_id;
|
$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) {
|
if (val === false) {
|
||||||
$scope.canAdd = false;
|
$scope.canAdd = false;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -16,6 +16,8 @@ export default
|
|||||||
index: false,
|
index: false,
|
||||||
hover: true,
|
hover: true,
|
||||||
well: false,
|
well: false,
|
||||||
|
title: false,
|
||||||
|
|
||||||
fields: {
|
fields: {
|
||||||
status: {
|
status: {
|
||||||
label: '',
|
label: '',
|
||||||
|
|||||||
@@ -42,14 +42,14 @@ export default
|
|||||||
scm_revision: {
|
scm_revision: {
|
||||||
label: i18n._('Revision'),
|
label: i18n._('Revision'),
|
||||||
excludeModal: true,
|
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'
|
class: 'List-staticColumnAdjacent--monospace'
|
||||||
},
|
},
|
||||||
scm_type: {
|
scm_type: {
|
||||||
label: i18n._('Type'),
|
label: i18n._('Type'),
|
||||||
ngBind: 'project.type_label',
|
ngBind: 'project.type_label',
|
||||||
excludeModal: true,
|
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: {
|
last_updated: {
|
||||||
label: i18n._('Last Updated'),
|
label: i18n._('Last Updated'),
|
||||||
|
|||||||
@@ -16,7 +16,7 @@
|
|||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div ui-view='list'></div>
|
<div ui-view="list"></div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div ng-include="'/static/partials/logviewer.html'"></div>
|
<div ng-include="'/static/partials/logviewer.html'"></div>
|
||||||
|
|||||||
@@ -134,7 +134,7 @@ export default ['$location', '$compile', '$rootScope', 'Attr', 'Icon',
|
|||||||
base, action, fld, cnt, field_action, fAction, itm;
|
base, action, fld, cnt, field_action, fAction, itm;
|
||||||
|
|
||||||
if (options.mode !== 'lookup') {
|
if (options.mode !== 'lookup') {
|
||||||
if (options.title !== false) {
|
if (options.title !== false && list.title !== false) {
|
||||||
html += "<div class=\"List-header\">";
|
html += "<div class=\"List-header\">";
|
||||||
html += "<div class=\"List-title\">";
|
html += "<div class=\"List-title\">";
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user