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

Merge pull request #398 from jaredevantabor/survey-select2

Browse Source 
Surveys: make MC and MS fields disabled while previewing a survey
This commit is contained in:
jaredevantabor
2015-09-03 10:25:37 -07:00
parent 5f6f16b5ff 5107100166
commit e46cc161fa
5 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui/client/src/job-templates/survey-maker/questions/finalize.factory.js
View File

@@ -81,7 +81,7 @@ export default
html += '<div class="row">'; html += '<div class="row">';
html += '<div class="col-xs-8">'; html += '<div class="col-xs-8">';
html += '<div class="SurveyControls-selectWrapper">'; html += '<div class="SurveyControls-selectWrapper">';
html += '<survey-question type="' + question.type + '" question="question" ng-required="' + question.required + '" ng-model="' + defaultScopePropertyName + '"></survey-question>'; html += '<survey-question type="' + question.type + '" question="question" ng-required="' + question.required + '" ng-model="' + defaultScopePropertyName + '" ng-disabled=true></survey-question>';
html += '</div>'; html += '</div>';
html += '</div>'; html += '</div>';
html += '</div>'; html += '</div>';

3
awx/ui/client/src/job-templates/survey-maker/render/multiple-choice.directive.js
View File

@@ -46,7 +46,8 @@ export default
choices: '=', choices: '=',
question: '=', question: '=',
isRequired: '=ngRequired', isRequired: '=ngRequired',
selectedValue: '=ngModel' selectedValue: '=ngModel',
isDisabled: '=ngDisabled'
}, },
templateUrl: templateUrl('job-templates/survey-maker/render/multiple-choice'), templateUrl: templateUrl('job-templates/survey-maker/render/multiple-choice'),
link: _.partial(link, $timeout) link: _.partial(link, $timeout)

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

@@ -1,5 +1,5 @@
<div> <div>
<select class="form-control" ng-model="selectedValue" multi-select ng-required="isRequired"> <select class="form-control" ng-model="selectedValue" multi-select ng-required="isRequired" ng-disabled="isDisabled">
<option ng-repeat="choice in choices" value="{{choice}}" ng-selected="selectedValue.indexOf(choice) !== -1">{{choice}}</option> <option ng-repeat="choice in choices" value="{{choice}}" ng-selected="selectedValue.indexOf(choice) !== -1">{{choice}}</option>
</select> </select>
</div> </div>

3
awx/ui/client/src/job-templates/survey-maker/render/survey-question.directive.js
View File

@@ -42,7 +42,8 @@ export default
{ question: '=', { question: '=',
selectedValue: '=ngModel', selectedValue: '=ngModel',
surveyQuestions: '=', surveyQuestions: '=',
isRequired: '@ngRequired' isRequired: '@ngRequired',
isDisabled: '@ngDisabled'
}, },
templateUrl: templateUrl('job-templates/survey-maker/render/survey-question'), templateUrl: templateUrl('job-templates/survey-maker/render/survey-question'),
link: link link: link

3
awx/ui/client/src/job-templates/survey-maker/render/survey-question.partial.html
View File

@@ -3,5 +3,6 @@
question="question" question="question"
choices="choices" choices="choices"
ng-required="isRequired === 'true'" ng-required="isRequired === 'true'"
ng-model="selectedValue"> ng-model="selectedValue"
ng-disabled="isDisabled === 'true'">
</multiple-choice> </multiple-choice>