External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-20 06:01:25 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5535 from jaredevantabor/ctit-reset

Browse Source 
CTiT Revert All
This commit is contained in:
Jared Tabor 2017-02-23 17:00:48 -08:00 committed by GitHub
commit 3fff094d6e
6 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui/client/src/configuration/auth-form/configuration-auth.controller.js
View File

@ -268,7 +268,7 @@ export default [
$scope.$on('populated', function() {
startCodeMirrors();
populateLDAPGroupType();
populateLDAPGroupType(false);
});
angular.extend(authVm, {

1
awx/ui/client/src/configuration/configuration.controller.js
View File

@ -449,6 +449,7 @@ export default [
.then(function() {
populateFromApi();
$scope[formTracker.currentFormName()].$setPristine();
$scope.$broadcast('CUSTOM_LOGO_reverted');
})
.catch(function(error) {
ProcessErrors($scope, error, status, formDefs[formTracker.getCurrent()],

4
awx/ui/client/src/configuration/jobs-form/configuration-jobs.controller.js
View File

@ -99,8 +99,8 @@ export default [
populateAdhocCommand(flag);
});
$scope.$on('populated', function(e, data, flag) {
populateAdhocCommand(flag);
$scope.$on('populated', function() {
populateAdhocCommand(false);
});
// Fix for bug where adding selected opts causes form to be $dirty and triggering modal

4
awx/ui/client/src/configuration/system-form/configuration-system.controller.js
View File

@ -152,8 +152,8 @@ export default [
var dropdownRendered = false;
$scope.$on('populated', function(e, data, flag) {
populateLogAggregator(flag);
$scope.$on('populated', function() {
populateLogAggregator(false);
});
$scope.$on('LOG_AGGREGATOR_TYPE_populated', function(e, data, flag) {

4
awx/ui/client/src/configuration/ui-form/configuration-ui.controller.js
View File

@ -101,8 +101,8 @@
populatePendoTrackingState(flag);
});
$scope.$on('populated', function(e, data, flag){
populatePendoTrackingState(flag);
$scope.$on('populated', function(){
populatePendoTrackingState(false);
});
angular.extend(uiVm, {

2
awx/ui/client/src/shared/directives.js
View File

@ -179,7 +179,7 @@ function(ConfigurationUtils, i18n, $rootScope) {
scope.$parent[fieldKey] = '';
filePickerButton.html(browseText);
filePickerText.val('');
filePicker.value = "";
filePicker.context.value = "";
scope.imagePresent = false;
}
else {