Merge branch 'master' into access-certification

Evolveum · Jun 9, 2015 · 217895d · 217895d
2 parents a2f8446 + 297310a
commit 217895d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 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
@@ -1,12 +1,14 @@
 package com.evolveum.midpoint.web.page.admin.home;
 
+import java.net.URLDecoder;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
-
+import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.commons.lang.NullArgumentException;
+import org.apache.velocity.app.event.implement.EscapeJavaScriptReference;
 import org.apache.wicket.RestartResponseException;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.markup.html.basic.Label;
@@ -19,6 +21,7 @@
 import org.apache.wicket.markup.repeater.RepeatingView;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.PropertyModel;
+import org.apache.wicket.util.encoding.UrlDecoder;
 import org.apache.wicket.util.string.StringValue;
 import org.aspectj.util.LangUtil.ProcessController.Thrown;
 import org.eclipse.core.internal.runtime.PrintStackUtil;
@@ -561,7 +564,9 @@ private void updateQuestions(String useroid, AjaxRequestTarget target){
 				answer.setClearValue(((TextField<String>)type.get(MyPasswordQuestionsPanel.F_ANSWER)).getModelObject());			
 				answerType.setQuestionAnswer(answer);
 
-				answerType.setQuestionIdentifier(getQuestionIdentifierFromQuestion(((Label)type.get(MyPasswordQuestionsPanel.F_QUESTION)).getDefaultModelObjectAsString()));			
+				//used apache's unescapeHtml method for special chars like \'
+				String results = StringEscapeUtils.unescapeHtml((type.get(MyPasswordQuestionsPanel.F_QUESTION)).getDefaultModelObjectAsString());
+				answerType.setQuestionIdentifier(getQuestionIdentifierFromQuestion(results));			
 				answerTypeList[listnum]=answerType;
 				listnum++;
 
@@ -615,6 +620,7 @@ private void updateQuestions(String useroid, AjaxRequestTarget target){
 	}
 
 	private String getQuestionIdentifierFromQuestion(String questionItself){
+		//LOGGER.info("\n\n QUESTION: "+questionItself);
 		for (Iterator iterator = policyQuestionList.iterator(); iterator
 				.hasNext();) {
 			SecurityQuestionDefinitionType securityQuestionDefinitionType = (SecurityQuestionDefinitionType) iterator

diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObject.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObject.java
@@ -68,6 +68,7 @@
         @NamedQuery(name = "getDefinition.ROExtPolyString", query = "select c.name, c.type, c.valueType from ROExtPolyString as c where c.ownerOid = :oid and c.ownerType = :ownerType"),
         @NamedQuery(name = "getDefinition.ROExtLong", query = "select c.name, c.type, c.valueType from ROExtLong as c where c.ownerOid = :oid and c.ownerType = :ownerType"),
         @NamedQuery(name = "getDefinition.ROExtReference", query = "select c.name, c.type, c.valueType from ROExtReference as c where c.ownerOid = :oid and c.ownerType = :ownerType"),
+        @NamedQuery(name = "getDefinition.ROExtBoolean", query = "select c.name, c.type, c.valueType from ROExtBoolean as c where c.ownerOid = :oid and c.ownerType = :ownerType"),
         @NamedQuery(name = "isAnySubordinateAttempt.oneLowerOid", query = "select count(*) from ROrgClosure o where o.ancestorOid=:aOid and o.descendantOid=:dOid"),
         @NamedQuery(name = "isAnySubordinateAttempt.moreLowerOids", query = "select count(*) from ROrgClosure o where o.ancestorOid=:aOid and o.descendantOid in (:dOids)"),
         @NamedQuery(name = "get.lookupTableLastId", query = "select max(r.id) from RLookupTableRow r where r.ownerOid = :oid"),