mirror of
https://github.com/ansible/awx.git
synced 2026-03-19 01:47:31 -02:30
update revert link text size in prompt
add revert to multi cred modal
This commit is contained in:
@@ -177,7 +177,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.JobSubmission-revertLink {
|
.JobSubmission-revertLink {
|
||||||
font-size: 14px;
|
font-size: 12px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.JobSubmission-selectedItem {
|
.JobSubmission-selectedItem {
|
||||||
|
|||||||
@@ -248,6 +248,21 @@ export default ['templateUrl', 'Rest', 'GetBasePath', 'generateList', '$compile'
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
$scope.selectedCredentialsDirty = function() {
|
||||||
|
if ($scope.originalSelectedCredentials) {
|
||||||
|
return !($scope.originalSelectedCredentials.machine === null &&
|
||||||
|
$scope.originalSelectedCredentials.extra.length === 0) &&
|
||||||
|
!_.eq($scope.selectedCredentials,
|
||||||
|
$scope.originalSelectedCredentials);
|
||||||
|
} else {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
$scope.revertToDefaultCredentials = function() {
|
||||||
|
$scope.selectedCredentials = _.cloneDeep($scope.originalSelectedCredentials);
|
||||||
|
};
|
||||||
|
|
||||||
$scope.removeCredential = function(credToRemove) {
|
$scope.removeCredential = function(credToRemove) {
|
||||||
$scope.credTags
|
$scope.credTags
|
||||||
.forEach(function(cred) {
|
.forEach(function(cred) {
|
||||||
|
|||||||
@@ -16,7 +16,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="modal-body">
|
<div class="modal-body">
|
||||||
<div class="MultiCredential-selectedBar"
|
<div class="MultiCredential-selectedBar"
|
||||||
ng-show="credTags && credTags.length">
|
ng-show="(credTags && credTags.length) || selectedCredentialsDirty()">
|
||||||
<span class="MultiCredential-selectedBarLabel" translate>
|
<span class="MultiCredential-selectedBarLabel" translate>
|
||||||
SELECTED:
|
SELECTED:
|
||||||
</span>
|
</span>
|
||||||
@@ -48,6 +48,9 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="MultiCredential-previewTagRevert">
|
||||||
|
<a class="MultiCredential-revertLink" href="" ng-show="selectedCredentialsDirty()" ng-click="revertToDefaultCredentials()" translate>REVERT</a>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="MultiCredential-credentialSubSection">
|
<div class="MultiCredential-credentialSubSection">
|
||||||
<span class="MultiCredential-selectLabel" translate>CREDENTIAL TYPE:</span>
|
<span class="MultiCredential-selectLabel" translate>CREDENTIAL TYPE:</span>
|
||||||
@@ -67,7 +70,7 @@
|
|||||||
<button type="button"
|
<button type="button"
|
||||||
ng-click="saveForm()"
|
ng-click="saveForm()"
|
||||||
ng-disabled="!credentials || credentials.length === 0"
|
ng-disabled="!credentials || credentials.length === 0"
|
||||||
class="Lookup-cancel btn btn-sm Form-saveButton" translate>
|
class="btn btn-sm Form-saveButton" translate>
|
||||||
SELECT
|
SELECT
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -122,3 +122,14 @@
|
|||||||
line-height: 24px;
|
line-height: 24px;
|
||||||
text-transform: uppercase;
|
text-transform: uppercase;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.MultiCredential-previewTagRevert {
|
||||||
|
flex: 0 0 60px;
|
||||||
|
line-height: 29px;
|
||||||
|
margin-left: auto;
|
||||||
|
text-align: right;
|
||||||
|
}
|
||||||
|
|
||||||
|
.MultiCredential-revertLink {
|
||||||
|
font-size: 12px;
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user