External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-08 01:47:35 -02:30
Code Issues Packages Projects Releases Wiki Activity

fix errors when adding first question to new survey

Browse Source
This commit is contained in:
Keith Grant
2020-03-20 09:41:28 -07:00
parent cfe0607b6a
commit 564012b2c8
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
awx/ui_next/src/screens/Template/Survey/SurveyQuestionAdd.jsx
View File

@@ -9,7 +9,7 @@ export default function SurveyQuestionAdd({ survey, updateSurvey }) {
const match = useRouteMatch(); const match = useRouteMatch();
const handleSubmit = async question => { const handleSubmit = async question => {
if (survey.spec.find(q => q.variable === question.variable)) { if (survey.spec?.some(q => q.variable === question.variable)) {
setFormError( setFormError(
new Error( new Error(
`Survey already contains a question with variable named “${question.variable}”` `Survey already contains a question with variable named “${question.variable}”`
@@ -18,7 +18,8 @@ export default function SurveyQuestionAdd({ survey, updateSurvey }) {
return; return;
} }
try { try {
await updateSurvey(survey.spec.concat(question)); const newSpec = survey.spec ? survey.spec.concat(question) : [question];
await updateSurvey(newSpec);
history.push(match.url.replace('/add', '')); history.push(match.url.replace('/add', ''));
} catch (err) { } catch (err) {
setFormError(err); setFormError(err);

3
awx/ui_next/src/screens/Template/TemplateSurvey.jsx
View File

@@ -39,7 +39,8 @@ function TemplateSurvey({ template, i18n }) {
); );
const updateSurveySpec = spec => { const updateSurveySpec = spec => {
updateSurvey({ updateSurvey({
...survey, name: survey.name || '',
description: survey.description || '',
spec, spec,
}); });
}; };