Adding successfully save feedback for password questions and properties

files were moved to the correct path
Evolveum · Apr 17, 2015 · ef59b57 · ef59b57
1 parent 3b23b6c
commit ef59b57
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 18 deletions.
diff --git a/...MyPasswordQuestions_tr_TR.utf8.properties → ...MyPasswordQuestions_tr_TR.utf8.properties b/...MyPasswordQuestions_tr_TR.utf8.properties → ...MyPasswordQuestions_tr_TR.utf8.properties
@@ -15,5 +15,6 @@
 #
 
 page.title=Şifre Sorularım
+message.success=Cevaplarınız Başarılı Bir Şekilde Güncellendi
 
 
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
@@ -6,6 +6,7 @@
 import java.util.Iterator;
 import java.util.List;
 
+import org.apache.commons.lang.NullArgumentException;
 import org.apache.wicket.RestartResponseException;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.markup.html.basic.Label;
@@ -14,10 +15,14 @@
 import org.apache.wicket.markup.html.form.validation.IFormValidator;
 import org.apache.wicket.markup.html.list.ListItem;
 import org.apache.wicket.markup.html.list.ListView;
+import org.apache.wicket.markup.html.panel.FeedbackPanel;
 import org.apache.wicket.markup.repeater.RepeatingView;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.PropertyModel;
 import org.apache.wicket.util.string.StringValue;
+import org.aspectj.util.LangUtil.ProcessController.Thrown;
+
+import ch.qos.logback.classic.Logger;
 
 import com.evolveum.midpoint.model.api.ModelService;
 import com.evolveum.midpoint.prism.PrismObject;
@@ -34,10 +39,12 @@
 import com.evolveum.midpoint.schema.SelectorOptions;
 import com.evolveum.midpoint.schema.result.OperationResult;
 import com.evolveum.midpoint.schema.util.MiscSchemaUtil;
+import com.evolveum.midpoint.security.api.AuthorizationConstants;
 import com.evolveum.midpoint.task.api.Task;
 import com.evolveum.midpoint.util.logging.LoggingUtils;
 import com.evolveum.midpoint.util.logging.Trace;
 import com.evolveum.midpoint.util.logging.TraceManager;
+import com.evolveum.midpoint.web.application.AuthorizationAction;
 import com.evolveum.midpoint.web.application.PageDescriptor;
 import com.evolveum.midpoint.web.component.AjaxButton;
 import com.evolveum.midpoint.web.component.AjaxSubmitButton;
@@ -71,6 +78,7 @@
 import com.evolveum.midpoint.xml.ns._public.common.common_3.UserType;
 import com.evolveum.prism.xml.ns._public.types_3.ProtectedStringType;
 
+
 @PageDescriptor(url = "/PasswordQuestions")
 public class PageMyPasswordQuestions extends PageAdminHome {
 
@@ -224,9 +232,8 @@ public void initLayout(){
 			//Global Policy set question numbers
 			questionNumber=securityPolicy.asObjectable().getCredentials().getSecurityQuestions().getQuestionNumber();
 
-
-
-			LOGGER.debug("****************Policy QuestionNumber************** :"+questionNumber);
+
+			LOGGER.debug("****************Policy QuestionNumber************** :"+questionNumber);			
 
 
 			// Actual Policy Question List
@@ -259,7 +266,7 @@ public void initLayout(){
 					for(int userQuestint=0;userQuestint<userQuestionList.size();userQuestint++){
 						SecurityQuestionAnswerDTO answerDTO=  checkIfQuestionisValid(userQuestionList.get(userQuestint), policyQuestionList);
 						if (answerDTO!=null){
-
+							
 							MyPasswordQuestionsPanel panel=new MyPasswordQuestionsPanel(ID_PASSWORD_QUESTIONS_PANEL+ panelNumber,answerDTO);
 							pqPanels.add(panel);
 							panelNumber++;
@@ -321,14 +328,15 @@ public void initLayout(){
 
 			}
 
-			//case that user has less number of questions than policy
-
-
+
+				
+				
 
 
 
 
 		} catch (Exception ex) {
+
 			ex.printStackTrace();
 			result.recordFatalError("Couldn't load system configuration.", ex);
 		}
@@ -372,6 +380,7 @@ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
 			}
 		};
 		mainForm.add(save);
+
 
 		AjaxButton back = new AjaxButton(ID_BACK, createStringResource("PageBase.button.back")) {
 
@@ -386,8 +395,11 @@ public void onClick(AjaxRequestTarget target) {
 	}
 
 	private void savePerformed(AjaxRequestTarget target) {
-
-		updateQuestions(SecurityUtils.getPrincipalUser().getOid());
+
+		/*
+		 * Oguzhan: added target variable to the updateQuestions method.
+		 */
+		updateQuestions(SecurityUtils.getPrincipalUser().getOid(), target);
 
 	}
 
@@ -463,16 +475,18 @@ private SecurityQuestionAnswerDTO checkIfQuestionisValid(SecurityQuestionAnswerD
 	}
 
 
-	private void updateQuestions(String useroid){
+	private void updateQuestions(String useroid, AjaxRequestTarget target){
 
 
 		Task task = createSimpleTask(OPERATION_SAVE_QUESTIONS);
 		OperationResult result = new OperationResult(OPERATION_SAVE_QUESTIONS);
 		SchemaRegistry registry = getPrismContext().getSchemaRegistry();
 
 
+		/*oguzhan:comment out unnecessary codes: 
 		String newPassword="";
 		PageBase page = (PageBase) getPage();
+		*/
 
 		SecurityQuestionAnswerType[] answerTypeList=new SecurityQuestionAnswerType[questionNumber];
 
@@ -484,14 +498,18 @@ private void updateQuestions(String useroid){
 				SecurityQuestionAnswerType answerType = new SecurityQuestionAnswerType();
 				ProtectedStringType answer = new ProtectedStringType();
 				//	System.out.println("Answerrrrr:"+((TextField<String>)type.get(MyPasswordQuestionsPanel.F_ANSWER)).getModelObject());
-				answer.setClearValue(((TextField<String>)type.get(MyPasswordQuestionsPanel.F_ANSWER)).getModelObject());
+				answer.setClearValue(((TextField<String>)type.get(MyPasswordQuestionsPanel.F_ANSWER)).getModelObject());			
 				answerType.setQuestionAnswer(answer);
-
-				answerType.setQuestionIdentifier(getQuestionIdentifierFromQuestion(((Label)type.get(MyPasswordQuestionsPanel.F_QUESTION)).getDefaultModelObjectAsString()));
+				
+				answerType.setQuestionIdentifier(getQuestionIdentifierFromQuestion(((Label)type.get(MyPasswordQuestionsPanel.F_QUESTION)).getDefaultModelObjectAsString()));			
 				answerTypeList[listnum]=answerType;
 				listnum++;
+				/*oguzhan:
+				 * listnum is index value of the answerTypeList array */
 
 			}
+
+			//if(answerTypeList.length !=)
 
 
 			// fill in answerType data here
@@ -528,8 +546,11 @@ private void updateQuestions(String useroid){
 			System.out.println("Update Questions5");
 
 			 */
+			success(getString("message.success"));
+		    target.add(getFeedbackPanel());
 		} catch(Exception ex){
-
+
+
 
 			ex.printStackTrace();
 		}
@@ -541,8 +562,6 @@ private void updateQuestions(String useroid){
 
 
 
-
-
 	}
 
 	private String getQuestionIdentifierFromQuestion(String questionItself){

diff --git a/...ssword/PageMyPasswordQuestions.properties → ...n/home/PageMyPasswordQuestions.properties b/...ssword/PageMyPasswordQuestions.properties → ...n/home/PageMyPasswordQuestions.properties
@@ -15,5 +15,4 @@
 #
 
 page.title=My Password Questions
-
-
+message.success=Your Answers Were Updated Successfully