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

Merge pull request #2236 from kensible/2030-inventoryAudit

Browse Source 
Inventory manage audit.
This commit is contained in:
kensible 2016-06-09 09:08:03 -04:00
commit 3c3a5ea3d2
10 changed files with 47 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
awx/ui/client/legacy-styles/forms.less
View File

@ -182,6 +182,12 @@
align-items: flex-start;
}
.Form-checkbox--stacked {
label {
display: block;
}
}
.Form-textUneditable {
.Form-textInput {
border: none;

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

@ -249,6 +249,7 @@ export default
label: 'Update Options',
type: 'checkbox_group',
ngShow: "source && (source.value !== 'manual' && source.value !== null)",
class: 'Form-checkbox--stacked',
fields: [{
name: 'overwrite',

4
awx/ui/client/src/help/InventoryGroups.js
View File

@ -3,7 +3,7 @@
*
* All Rights Reserved
*************************************************/
/**
* @ngdoc function
* @name help.function:InventoryGroups
@ -53,7 +53,7 @@ angular.module('InventoryGroupsHelpDefinition', [])
maxWidth: 187,
maxHeight: 175
},
box: "To import a cloud inventory into Tower, initiate an inventory sync by clicking <i class=\"fa fa-exchange\"></i>."
box: "To import a cloud inventory into Tower, initiate an inventory sync by clicking <i class=\"fa fa-refresh\"></i>."
}, {
intro: "Add subgroups:",
img: {

4
awx/ui/client/src/helpers/Groups.js
View File

@ -90,7 +90,7 @@ angular.module('GroupsHelper', [ 'RestServices', 'Utilities', listGenerator.name
// do nothing
} else if (Empty(group.status) || group.status === "never updated") {
Alert('No Status Available', 'An inventory sync has not been performed for the selected group. Start the process by ' +
'clicking the <i class="fa fa-exchange"></i> button.', 'alert-info', null, null, null, null, true);
'clicking the <i class="fa fa-refresh"></i> button.', 'alert-info', null, null, null, null, true);
} else {
Wait('start');
Rest.setUrl(group.related.inventory_source);
@ -174,7 +174,7 @@ angular.module('GroupsHelper', [ 'RestServices', 'Utilities', listGenerator.name
case 'never updated':
stat = 'never';
stat_class = 'na';
status_tip = 'Sync not performed. Click <i class="fa fa-exchange"></i> to start it now.';
status_tip = 'Sync not performed. Click <i class="fa fa-refresh"></i> to start it now.';
break;
case 'none':
case 'ok':

17
awx/ui/client/src/inventories/manage/adhoc/adhoc.controller.js
View File

@ -10,7 +10,7 @@
* @description This controller controls the adhoc form creation, command launching and navigating to standard out after command has been succesfully ran.
*/
function adhocController($q, $scope, $location, $stateParams,
$state, CheckPasswords, PromptForPasswords, CreateLaunchDialog, adhocForm,
$state, CheckPasswords, PromptForPasswords, CreateLaunchDialog, CreateSelect2, adhocForm,
GenerateForm, Rest, ProcessErrors, ClearScope, GetBasePath, GetChoices,
KindChange, LookUpInit, CredentialList, Empty, Wait) {
@ -68,6 +68,17 @@ function adhocController($q, $scope, $location, $stateParams,
if (formReadyPromise === 2) {
privateFn.setFieldDefaults($scope.adhoc_verbosity_options,
$scope.forks_field.default);
CreateSelect2({
element: '#adhoc_module_name',
multiple: false
});
CreateSelect2({
element: '#adhoc_verbosity',
multiple: false
});
Wait('stop');
}
}
@ -295,7 +306,7 @@ function adhocController($q, $scope, $location, $stateParams,
}
export default ['$q', '$scope', '$location', '$stateParams',
'$state', 'CheckPasswords', 'PromptForPasswords', 'CreateLaunchDialog', 'adhocForm',
'GenerateForm', 'Rest', 'ProcessErrors', 'ClearScope', 'GetBasePath',
'$state', 'CheckPasswords', 'PromptForPasswords', 'CreateLaunchDialog', 'CreateSelect2',
'adhocForm', 'GenerateForm', 'Rest', 'ProcessErrors', 'ClearScope', 'GetBasePath',
'GetChoices', 'KindChange', 'LookUpInit', 'CredentialList', 'Empty', 'Wait',
adhocController];

12
awx/ui/client/src/inventories/manage/adhoc/adhoc.form.js
View File

@ -123,17 +123,17 @@ export default function() {
},
},
buttons: {
launch: {
label: 'Save',
ngClick: 'launchJob()',
ngDisabled: true,
'class': 'btn btn-sm List-buttonSubmit'
},
reset: {
ngClick: 'formReset()',
ngDisabled: true,
label: 'Reset',
'class': 'btn btn-sm Form-cancelButton'
},
launch: {
label: 'Save',
ngClick: 'launchJob()',
ngDisabled: true,
'class': 'btn btn-sm List-buttonSubmit'
}
},

5
awx/ui/client/src/lists/Groups.js
View File

@ -3,7 +3,7 @@
*
* All Rights Reserved
*************************************************/
@ -15,7 +15,8 @@ export default
iterator: 'group',
selectTitle: 'Copy Groups',
index: false,
well: false,
well: false,
emptyListText: 'PLEASE CREATE ADDITIONAL GROUPS / HOSTS TO PERFORM THIS ACTION',
fields: {
name: {
key: true,

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

@ -129,7 +129,7 @@ angular.module('GeneratorHelpers', [systemStatus.name])
icon = "fa-trash-o";
break;
case 'group_update':
icon = 'fa-exchange';
icon = 'fa-refresh';
break;
case 'scm_update':
icon = 'fa-cloud-download';

14
awx/ui/client/src/system-tracking/fact-data-table/fact-data-table.block.less
View File

@ -85,11 +85,19 @@
justify-content: center;
&-message {
font-size: 1.5em;
font-size: 14px;
line-height: 1.5;
text-align: center;
width: 75%;
margin-bottom: 2em;
color: @default-interface-txt;
text-transform: uppercase;
width: 100%;
height: 200px;
display: flex;
align-items: center;
justify-content: center;
border-radius: 5px;
border: 1px solid @default-no-items-bord;
background-color: @default-no-items-bord;
}
&-note {

2
awx/ui/client/src/system-tracking/system-tracking.partial.html
View File

@ -8,7 +8,7 @@
</section>
<section class="SystemTrackingContainer Panel" ng-hide="noModuleData">
<div class="row">
<div class="Form-title ng-binding col-md-3">SYSTEM TRACKING | {{inventory.name}}</div>
<div class="Form-title ng-binding col-md-3">SYSTEM TRACKING <div class="List-titleLockup"></div>{{inventory.name}}</div>
<div class="FactModulePickers row col-md-8 col-md-offset-1">
<div class="row">
<div class="FactModulePickers-dateContainer FactModulePickers-dateContainer--left col-md-6">