@@ -180,15 +180,16 @@ public IActionResult AddAssessmentQuestions()
180180 public IActionResult AddAssessmentQuestions ( AddAssessmentQuestionsFormData model )
181181 {
182182 var data = GetBulkUploadData ( ) ;
183- data . AddDefaultAssessmentQuestions = model . AddDefaultAssessmentQuestions ;
183+
184184 if ( model . AddDefaultAssessmentQuestions )
185185 {
186- data . DefaultQuestionIDs = model . DefaultAssessmentQuestionIDs ;
186+ data . DefaultQuestionIDs = model . DefaultAssessmentQuestionIDs ?? [ ] ;
187187 }
188188 else
189189 {
190190 data . DefaultQuestionIDs = [ ] ;
191191 }
192+ data . AddDefaultAssessmentQuestions = ( data . DefaultQuestionIDs . Count > 0 && model . AddDefaultAssessmentQuestions ) ;
192193 data . AddCustomAssessmentQuestion = model . AddCustomAssessmentQuestion ;
193194 if ( model . AddCustomAssessmentQuestion )
194195 {
@@ -198,7 +199,7 @@ public IActionResult AddAssessmentQuestions(AddAssessmentQuestionsFormData model
198199 {
199200 data . CustomAssessmentQuestionID = null ;
200201 }
201- if ( data . CompetenciesToUpdateCount > 0 )
202+ if ( data . CompetenciesToUpdateCount > 0 && data . DefaultQuestionIDs . Count + ( data . CustomAssessmentQuestionID != null ? 1 : 0 ) > 0 )
202203 {
203204 data . AddAssessmentQuestionsOption = 2 ;
204205 setBulkUploadData ( data ) ;
@@ -215,7 +216,7 @@ public IActionResult AddAssessmentQuestions(AddAssessmentQuestionsFormData model
215216 public IActionResult AddQuestionsToWhichCompetencies ( )
216217 {
217218 var data = GetBulkUploadData ( ) ;
218- if ( data . DefaultQuestionIDs . Count == 0 && data . CustomAssessmentQuestionID == null )
219+ if ( data . DefaultQuestionIDs != null && data . CustomAssessmentQuestionID == null )
219220 {
220221 return RedirectToAction ( "ImportSummary" , "Frameworks" , new { frameworkId = data . FrameworkId , tabname = data . TabName } ) ;
221222 }
0 commit comments