From 473cc1ffa4f45056ff1c550309317d10378caec3 Mon Sep 17 00:00:00 2001 From: Jared Tabor Date: Fri, 17 Oct 2014 17:04:03 -0400 Subject: [PATCH] fixed the styling on the job launch modal the input fields were not uniform throughout the modal window. i also started a fix for the multiselect problem i'm having with angular validation --- awx/ui/static/js/helpers/JobSubmission.js | 29 ++++++++++++++++++++++- awx/ui/static/less/survey-maker.less | 9 ++----- 2 files changed, 30 insertions(+), 8 deletions(-) diff --git a/awx/ui/static/js/helpers/JobSubmission.js b/awx/ui/static/js/helpers/JobSubmission.js index 01e5f02bf6..47f0a521f8 100644 --- a/awx/ui/static/js/helpers/JobSubmission.js +++ b/awx/ui/static/js/helpers/JobSubmission.js @@ -594,10 +594,37 @@ function($location, Wait, GetBasePath, LookUpInit, JobTemplateForm, CredentialLi } if(question.type === "multiselect"){ + // question.options = question.choices.split(/\n/); choices = question.choices.split(/\n/); - element = (question.type==="multiselect") ? "checkbox" : 'radio'; + + // element = (question.type==="multiselect") ? "checkbox" : 'radio'; question.default = (question.default) ? question.default : (question.default_multiselect) ? question.default_multiselect : "" ; // scope[question.variable].choices = choices; + // scope[question.variable] = { + // options: question.options, + // default: question.default, + // name: 'multi checkboxes', + // required: true, + // value: '' + // } + // function Ctrl($scope) { + // $scope.field = { + // name:'multi checkboxes', + // value:'', + // required:true, + // options:[ + // {value:'option 1'}, + // {value:'option 2'}, + // {value:'option 3'} + // ] + // }; + // } + + // html+='' + + // '
valid
'+ + // '
invalid
'; + + html+='
'; for( j = 0; j