From 5107100166aec4524df929fa4c5a654983eabb75 Mon Sep 17 00:00:00 2001 From: Jared Tabor Date: Tue, 1 Sep 2015 15:14:07 -0700 Subject: [PATCH] Surveys: make MC and MS fields disabled while previewing a survey --- .../job-templates/survey-maker/questions/finalize.factory.js | 2 +- .../survey-maker/render/multiple-choice.directive.js | 3 ++- .../survey-maker/render/multiple-choice.partial.html | 2 +- .../survey-maker/render/survey-question.directive.js | 3 ++- .../survey-maker/render/survey-question.partial.html | 3 ++- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/awx/ui/client/src/job-templates/survey-maker/questions/finalize.factory.js b/awx/ui/client/src/job-templates/survey-maker/questions/finalize.factory.js index e790f8e2dd..f17f477682 100644 --- a/awx/ui/client/src/job-templates/survey-maker/questions/finalize.factory.js +++ b/awx/ui/client/src/job-templates/survey-maker/questions/finalize.factory.js @@ -81,7 +81,7 @@ export default html += '
'; html += '
'; html += '
'; - html += ''; + html += ''; html += '
'; html += '
'; html += '
'; diff --git a/awx/ui/client/src/job-templates/survey-maker/render/multiple-choice.directive.js b/awx/ui/client/src/job-templates/survey-maker/render/multiple-choice.directive.js index aaa36ac053..9dd272d27e 100644 --- a/awx/ui/client/src/job-templates/survey-maker/render/multiple-choice.directive.js +++ b/awx/ui/client/src/job-templates/survey-maker/render/multiple-choice.directive.js @@ -46,7 +46,8 @@ export default choices: '=', question: '=', isRequired: '=ngRequired', - selectedValue: '=ngModel' + selectedValue: '=ngModel', + isDisabled: '=ngDisabled' }, templateUrl: templateUrl('job-templates/survey-maker/render/multiple-choice'), link: _.partial(link, $timeout) diff --git a/awx/ui/client/src/job-templates/survey-maker/render/multiple-choice.partial.html b/awx/ui/client/src/job-templates/survey-maker/render/multiple-choice.partial.html index 57557c76ca..33bc78c2e5 100644 --- a/awx/ui/client/src/job-templates/survey-maker/render/multiple-choice.partial.html +++ b/awx/ui/client/src/job-templates/survey-maker/render/multiple-choice.partial.html @@ -1,5 +1,5 @@
-
diff --git a/awx/ui/client/src/job-templates/survey-maker/render/survey-question.directive.js b/awx/ui/client/src/job-templates/survey-maker/render/survey-question.directive.js index da620de889..28db1c8eef 100644 --- a/awx/ui/client/src/job-templates/survey-maker/render/survey-question.directive.js +++ b/awx/ui/client/src/job-templates/survey-maker/render/survey-question.directive.js @@ -42,7 +42,8 @@ export default { question: '=', selectedValue: '=ngModel', surveyQuestions: '=', - isRequired: '@ngRequired' + isRequired: '@ngRequired', + isDisabled: '@ngDisabled' }, templateUrl: templateUrl('job-templates/survey-maker/render/survey-question'), link: link diff --git a/awx/ui/client/src/job-templates/survey-maker/render/survey-question.partial.html b/awx/ui/client/src/job-templates/survey-maker/render/survey-question.partial.html index 1b761f17e5..24b95bfd43 100644 --- a/awx/ui/client/src/job-templates/survey-maker/render/survey-question.partial.html +++ b/awx/ui/client/src/job-templates/survey-maker/render/survey-question.partial.html @@ -3,5 +3,6 @@ question="question" choices="choices" ng-required="isRequired === 'true'" - ng-model="selectedValue"> + ng-model="selectedValue" + ng-disabled="isDisabled === 'true'">