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

Merge pull request #5873 from mabashian/5850-job-launch-multi-select

Browse Source 
Add validation to the multi-select questions in survey
This commit is contained in:
Michael Abashian 2017-03-23 14:03:51 -04:00 committed by GitHub
commit 4412a9e034
2 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1371,4 +1371,33 @@ function(ConfigurationUtils, i18n, $rootScope) {
});
}
};
}])
.directive('awRequireMultiple', [function() {
return {
require: 'ngModel',
link: function postLink(scope, element, attrs, ngModel) {
// Watch for changes to the required attribute
attrs.$observe('required', function(value) {
if(value) {
ngModel.$validators.required = function (value) {
if(angular.isArray(value)) {
if(value.length === 0) {
return false;
}
else {
return (!value[0] || value[0] === "") ? false : true;
}
}
else {
return false;
}
};
}
else {
delete ngModel.$validators.required;
}
});
}
};
}]);

2
awx/ui/client/src/templates/survey-maker/render/multiple-choice.partial.html
View File

@ -1,5 +1,5 @@
<div>
<select class="form-control SurveyMaker-previewSelect" ng-model="selectedValue" multi-select ng-required="isRequired" ng-disabled="isDisabled">
<select class="form-control SurveyMaker-previewSelect" ng-model="selectedValue" multi-select ng-required="isRequired" ng-disabled="isDisabled" aw-require-multiple>
<option ng-repeat="choice in choices" value="{{choice}}">{{choice}}</option>
</select>
</div>