simplify user metadata printing.

If user had metadata, the old code for example added a  after _each_ <li> tag
which broke for example the menu in funny ways

code/moya-web/WebContent/resources/cditools/user/edit.xhtml

@@ -159,17 +159,7 @@
 		</h:form>
 		</h:form>
 
 
 		<p:fieldset legend="#{i18n['user.meta.box.title']}" toggleable="true" collapsed="true" rendered="#{not empty userView.meta}">
 		<p:fieldset legend="#{i18n['user.meta.box.title']}" toggleable="true" collapsed="true" rendered="#{not empty userView.meta}">
-			<h:outputScript target="head" library="script" name="jsonview.js" />
-			<h:outputScript target="head">
-				window.onload = function() {
-					jsonView('#usermetaview');
-				}
-			</h:outputScript>
-			<h:form id="usermetaform" enctype="multipart/form-data">
-					<p:panelGrid columns="1" cellpadding="1">
-						<div id="usermetaview">#{userView.meta}</div>
-					</p:panelGrid>
-			</h:form>
+			<div id="usermetaview"><pre><h:outputText value="#{userView.prettyMeta}" /></pre></div>
 		</p:fieldset>
 		</p:fieldset>
 
 
 
 

code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/user/UserView.java

@@ -20,7 +20,10 @@ package fi.codecrew.moya.web.cdiview.user;
 
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.IOException;
+import java.io.StringWriter;
+import java.util.HashMap;
 import java.util.List;
 import java.util.List;
+import java.util.Map;
 
 
 import javax.ejb.EJB;
 import javax.ejb.EJB;
 import javax.enterprise.context.Conversation;
 import javax.enterprise.context.Conversation;
@@ -31,7 +34,11 @@ import javax.faces.context.FacesContext;
 import javax.faces.event.ValueChangeEvent;
 import javax.faces.event.ValueChangeEvent;
 import javax.inject.Inject;
 import javax.inject.Inject;
 import javax.inject.Named;
 import javax.inject.Named;
+import javax.json.Json;
 import javax.json.JsonObject;
 import javax.json.JsonObject;
+import javax.json.JsonWriter;
+import javax.json.JsonWriterFactory;
+import javax.json.stream.JsonGenerator;
 
 
 import org.primefaces.event.CaptureEvent;
 import org.primefaces.event.CaptureEvent;
 import org.primefaces.event.FileUploadEvent;
 import org.primefaces.event.FileUploadEvent;
@@ -649,6 +656,24 @@ public class UserView extends GenericCDIView {
 		return "";
 		return "";
 	}
 	}
 
 
+	public String getPrettyMeta(){
+		JsonObject meta = getSelectedUser().getUser().getMeta();
+		if(meta == null){
+			return "";
+		}
+
+		StringWriter stringWriter = new StringWriter();
+		Map<String, Boolean> config = new HashMap<String, Boolean>();
+		config.put(JsonGenerator.PRETTY_PRINTING, true);
+		JsonWriterFactory writerFactory = Json.createWriterFactory(config);
+		JsonWriter jsonWriter = writerFactory.createWriter(stringWriter);
+
+		jsonWriter.write(meta);
+		jsonWriter.close();
+
+		return stringWriter.toString();
+	}
+
 	public String getEmailCheck() {
 	public String getEmailCheck() {
 		return emailCheck;
 		return emailCheck;
 	}
 	}