Fix for the end user page reset for the bug presetted questions not c…

…oming Fixes issue #MID-2319
Evolveum · Apr 22, 2015 · 75904b9 · 75904b9
1 parent 6e00386
commit 75904b9
Showing 1 changed file with 15 additions and 12 deletions.
diff --git a/...-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageMyPasswordQuestions.java b/...-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageMyPasswordQuestions.java
@@ -245,22 +245,25 @@ public void initLayout(){
 
 			policyQuestionList = securityPolicy.asObjectable().getCredentials().getSecurityQuestions().getQuestion();
 			}catch(Exception ex){
-				ex.printStackTrace();
+
 				System.out.println("Access");
 				List<SecurityQuestionAnswerDTO> userQuestionList= model.getObject().getSecurityAnswers();
 				int panelNumber=0;
-				if(userQuestionList==null){
-					PrismObject<UserType> user = null;
+				PrismObject<UserType> user = null;
+
 
-
 
-						Collection options = SelectorOptions.createCollection(UserType.F_CREDENTIALS,
-								GetOperationOptions.createRetrieve(RetrieveOption.INCLUDE));
-						Task taskTwo = createSimpleTask("LOAD USER WRAPPER");
-						user = getModelService().getObject(UserType.class, SecurityUtils.getPrincipalUser().getOid(), options, taskTwo, result);
-						OperationResult parentResult = new OperationResult(OPERATION_LOAD_USER);
-						questionNumber = getModelInteractionService().getCredentialsPolicy(user, parentResult).getSecurityQuestions().getQuestionNumber();
-						policyQuestionList=getModelInteractionService().getCredentialsPolicy(user, parentResult).getSecurityQuestions().getQuestion();
+				Collection options = SelectorOptions.createCollection(UserType.F_CREDENTIALS,
+						GetOperationOptions.createRetrieve(RetrieveOption.INCLUDE));
+				Task taskTwo = createSimpleTask("LOAD USER WRAPPER");
+				user = getModelService().getObject(UserType.class, SecurityUtils.getPrincipalUser().getOid(), options, taskTwo, result);
+
+				OperationResult parentResult = new OperationResult(OPERATION_LOAD_QUESTION_POLICY);
+				questionNumber = getModelInteractionService().getCredentialsPolicy(user, parentResult).getSecurityQuestions().getQuestionNumber();
+
+				policyQuestionList=getModelInteractionService().getCredentialsPolicy(user, parentResult).getSecurityQuestions().getQuestion();
+				if(userQuestionList==null){
+
 						for(int i=0;i<questionNumber;i++){
 							System.out.println("Adding panel element");
 							SecurityQuestionAnswerDTO a=new SecurityQuestionAnswerDTO(policyQuestionList.get(panelNumber).getIdentifier(),"",policyQuestionList.get(panelNumber).getQuestionText());
@@ -277,7 +280,7 @@ public void initLayout(){
 					System.out.println("Else");
 					for(int userQuestint=0;userQuestint<userQuestionList.size();userQuestint++){
 					//	SecurityQuestionAnswerDTO answerDTO=  checkIfQuestionisValid(userQuestionList.get(userQuestint), policyQuestionList);
-
+						SecurityQuestionAnswerDTO answerDTO=  checkIfQuestionisValid(userQuestionList.get(userQuestint), policyQuestionList);
 						if (userQuestionList.get(userQuestint)!=null){
 
 							MyPasswordQuestionsPanel panel=new MyPasswordQuestionsPanel(ID_PASSWORD_QUESTIONS_PANEL+ panelNumber,userQuestionList.get(userQuestint));