From ef59b57a5c94fe35749ef2437ee570b191c426c6 Mon Sep 17 00:00:00 2001 From: ogz00 Date: Fri, 17 Apr 2015 17:25:20 +0300 Subject: [PATCH] Adding successfully save feedback for password questions and properties files were moved to the correct path --- ...eMyPasswordQuestions_tr_TR.utf8.properties | 1 + .../admin/home/PageMyPasswordQuestions.java | 51 +++++++++++++------ .../home}/PageMyPasswordQuestions.properties | 3 +- 3 files changed, 37 insertions(+), 18 deletions(-) rename gui/admin-gui-tr-TR/src/main/resources/com/evolveum/midpoint/web/page/{forgetpassword => admin/home}/PageMyPasswordQuestions_tr_TR.utf8.properties (89%) rename gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/{forgetpassword => admin/home}/PageMyPasswordQuestions.properties (91%) diff --git a/gui/admin-gui-tr-TR/src/main/resources/com/evolveum/midpoint/web/page/forgetpassword/PageMyPasswordQuestions_tr_TR.utf8.properties b/gui/admin-gui-tr-TR/src/main/resources/com/evolveum/midpoint/web/page/admin/home/PageMyPasswordQuestions_tr_TR.utf8.properties similarity index 89% rename from gui/admin-gui-tr-TR/src/main/resources/com/evolveum/midpoint/web/page/forgetpassword/PageMyPasswordQuestions_tr_TR.utf8.properties rename to gui/admin-gui-tr-TR/src/main/resources/com/evolveum/midpoint/web/page/admin/home/PageMyPasswordQuestions_tr_TR.utf8.properties index 11b68315c31..e18f98cdce1 100644 --- a/gui/admin-gui-tr-TR/src/main/resources/com/evolveum/midpoint/web/page/forgetpassword/PageMyPasswordQuestions_tr_TR.utf8.properties +++ b/gui/admin-gui-tr-TR/src/main/resources/com/evolveum/midpoint/web/page/admin/home/PageMyPasswordQuestions_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/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageMyPasswordQuestions.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageMyPasswordQuestions.java index e6a4147cc4d..68ba9230691 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageMyPasswordQuestions.java +++ b/gui/admin-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 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,7 +475,7 @@ private SecurityQuestionAnswerDTO checkIfQuestionisValid(SecurityQuestionAnswerD } - private void updateQuestions(String useroid){ + private void updateQuestions(String useroid, AjaxRequestTarget target){ Task task = createSimpleTask(OPERATION_SAVE_QUESTIONS); @@ -471,8 +483,10 @@ private void updateQuestions(String useroid){ 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)type.get(MyPasswordQuestionsPanel.F_ANSWER)).getModelObject()); - answer.setClearValue(((TextField)type.get(MyPasswordQuestionsPanel.F_ANSWER)).getModelObject()); + answer.setClearValue(((TextField)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/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageMyPasswordQuestions.properties b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageMyPasswordQuestions.properties similarity index 91% rename from gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageMyPasswordQuestions.properties rename to gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageMyPasswordQuestions.properties index b402d0656a4..4d6990f699c 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageMyPasswordQuestions.properties +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageMyPasswordQuestions.properties @@ -15,5 +15,4 @@ # page.title=My Password Questions - - +message.success=Your Answers Were Updated Successfully \ No newline at end of file