Allows to return HTML from serializing views

[lgpl/argeo-commons.git] / server / runtime / org.argeo.server.core / src / main / java / org / argeo / server / mvc / SerializingView.java

diff --git a/server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/mvc/SerializingView.java b/server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/mvc/SerializingView.java
index 02654e9ebf224d3928e9ff4c867649636c173d11..ed7ab9d1b65fbb286796c1f173d531fc17625f9b 100644 (file)
--- a/server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/mvc/SerializingView.java
+++ b/server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/mvc/SerializingView.java
@@ -7,6 +7,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.argeo.ArgeoException;
+import org.argeo.server.ServerAnswer;
 import org.argeo.server.ServerSerializer;
 import org.springframework.web.servlet.view.AbstractView;
 
@@ -28,11 +29,15 @@ public class SerializingView extends AbstractView implements MvcConstants {
        protected void renderMergedOutputModel(Map model,
                        HttpServletRequest request, HttpServletResponse response)
                        throws Exception {
+               Boolean serverAnswersAsHtml = false;
                final Object answer;
                if (model.size() == 1) {
                        answer = model.values().iterator().next();
                } else if (model.containsKey(ANSWER_MODEL_KEY)) {
                        answer = model.get(ANSWER_MODEL_KEY);
+               } else if (model.containsKey(ANSWER_MODEL_KEY_AS_HTML)) {
+                       answer = model.get(ANSWER_MODEL_KEY_AS_HTML);
+                       serverAnswersAsHtml = true;
                } else if (model.containsKey(viewName)) {
                        answer = model.get(viewName);
                } else {
@@ -40,7 +45,15 @@ public class SerializingView extends AbstractView implements MvcConstants {
                                        "Model has a size different from 1. Specify a modelKey.");
                }
 
-               serializer.serialize(answer, request, response);
+               if ((answer instanceof ServerAnswer) && serverAnswersAsHtml) {
+                       response.setContentType("text/html");
+                       ServerAnswer serverAnswer = (ServerAnswer) answer;
+                       response.getWriter().append("<pre>");
+                       response.getWriter().append(serverAnswer.getMessage());
+                       response.getWriter().append("</pre>");
+               } else {
+                       serializer.serialize(answer, request, response);
+               }
        }
 
        public String getViewName() {