You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by rm...@apache.org on 2012/07/05 22:52:35 UTC
svn commit: r1357904 - in
/incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher:
Dispatcher.java view/action/ActionForm.java view/form/HtmlFormBuilder.java
view/logon/Logon.java
Author: rmatthews
Date: Thu Jul 5 20:52:35 2012
New Revision: 1357904
URL: http://svn.apache.org/viewvc?rev=1357904&view=rev
Log:
ISIS-162 - Adjustments to cancel buttons for forms
Modified:
incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/Dispatcher.java
incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/action/ActionForm.java
incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/form/HtmlFormBuilder.java
incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/logon/Logon.java
Modified: incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/Dispatcher.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/Dispatcher.java?rev=1357904&r1=1357903&r2=1357904&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/Dispatcher.java (original)
+++ incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/Dispatcher.java Thu Jul 5 20:52:35 2012
@@ -35,6 +35,7 @@ import java.util.Stack;
import org.apache.isis.applib.Identifier;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
+import org.apache.isis.core.commons.config.ConfigurationConstants;
import org.apache.isis.core.commons.debug.DebugBuilder;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.commons.factory.InstanceUtil;
@@ -74,6 +75,7 @@ import org.dom4j.Element;
import org.dom4j.io.SAXReader;
public class Dispatcher {
+ private static final String SHOW_UNSHOWN_MESSAGES = ConfigurationConstants.ROOT + "scimpi.show-unshown-messages";
public static final String ACTION = "_action";
public static final String EDIT = "_edit";
public static final String REMOVE = "_remove";
@@ -86,6 +88,7 @@ public class Dispatcher {
private final ProcessorLookup processors = new ProcessorLookup();
private final HtmlFileParser parser = new HtmlFileParser(processors);
private final Encoder encoder = new SimpleEncoder();
+ private boolean showUnshownMessages;
public void process(final RequestContext context, final String servletPath) {
LOG.debug("processing request " + servletPath);
@@ -282,14 +285,22 @@ public class Dispatcher {
public void noteIfMessagesHaveNotBeenDisplay(final RequestContext context) {
final List<String> messages = IsisContext.getMessageBroker().getMessages();
- if (messages.size() > 0) {
- // TODO write out all messages
- context.getWriter().println("Note - messages existed but where not displayed");
- }
- final List<String> warnings = IsisContext.getMessageBroker().getWarnings();
- if (warnings.size() > 0) {
- // TODO write out all warning
- context.getWriter().println("Note - warnings existed but where not displayed");
+ if (showUnshownMessages) {
+ if (messages.size() > 0) {
+ context.getWriter().println("<ol class=\"messages forced\">");
+ for (String message : messages) {
+ context.getWriter().println("<li>" + message + "</li>");
+ }
+ context.getWriter().println("</ol>");
+ }
+ final List<String> warnings = IsisContext.getMessageBroker().getWarnings();
+ if (warnings.size() > 0) {
+ context.getWriter().println("<ol class=\"warnings forced\">");
+ for (String message : warnings) {
+ context.getWriter().println("<li>" + message + "</li>");
+ }
+ context.getWriter().println("</ol>");
+ }
}
}
@@ -397,6 +408,8 @@ public class Dispatcher {
processors.init();
processors.addElementProcessor(new org.apache.isis.viewer.scimpi.dispatcher.view.debug.Debug(this));
+
+ showUnshownMessages = IsisContext.getConfiguration().getBoolean(SHOW_UNSHOWN_MESSAGES, true);
}
private void loadConfigFile(final File file) {
Modified: incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/action/ActionForm.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/action/ActionForm.java?rev=1357904&r1=1357903&r2=1357904&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/action/ActionForm.java (original)
+++ incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/action/ActionForm.java Thu Jul 5 20:52:35 2012
@@ -47,10 +47,10 @@ public class ActionForm extends Abstract
final CreateFormParameter parameters = new CreateFormParameter();
parameters.objectId = request.getOptionalProperty(OBJECT);
parameters.methodName = request.getRequiredProperty(METHOD);
- parameters.cancelTo = request.getOptionalProperty(CANCEL_TO);
parameters.forwardResultTo = request.getOptionalProperty(VIEW);
parameters.forwardVoidTo = request.getOptionalProperty(VOID);
parameters.forwardErrorTo = request.getOptionalProperty(ERROR);
+ parameters.cancelTo = request.getOptionalProperty(CANCEL_TO);
parameters.showIcon = request.isRequested(SHOW_ICON, showIconByDefault());
parameters.buttonTitle = request.getOptionalProperty(BUTTON_TITLE);
parameters.formTitle = request.getOptionalProperty(FORM_TITLE);
@@ -154,7 +154,8 @@ public class ActionForm extends Abstract
final String cancelTo = parameterObject.cancelTo == null ? "_generic.shtml?_result=" + objectId : parameterObject.cancelTo;
- HtmlFormBuilder.createForm(request, ActionAction.ACTION + ".app", hiddenFields, formFields, parameterObject.className, parameterObject.id, formTitle, action.getDescription(), action.getHelp(), buttonTitle, errors, cancelTo);
+ HtmlFormBuilder.createForm(request, ActionAction.ACTION + ".app", hiddenFields, formFields, parameterObject.className,
+ parameterObject.id, formTitle, action.getDescription(), action.getHelp(), buttonTitle, errors, cancelTo);
request.popBlockContent();
}
Modified: incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/form/HtmlFormBuilder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/form/HtmlFormBuilder.java?rev=1357904&r1=1357903&r2=1357904&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/form/HtmlFormBuilder.java (original)
+++ incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/form/HtmlFormBuilder.java Thu Jul 5 20:52:35 2012
@@ -25,8 +25,19 @@ import org.apache.isis.viewer.scimpi.dis
public class HtmlFormBuilder {
- public static void createForm(final Request request, final String action, final HiddenInputField[] hiddenFields, final InputField[] fields, final String className, final String id, final String formTitle, final String description, final String helpReference, final String buttonTitle,
- final String errors, final String cancelTo) {
+ public static void createForm(
+ final Request request,
+ final String action,
+ final HiddenInputField[] hiddenFields,
+ final InputField[] fields,
+ final String className,
+ final String id,
+ final String formTitle,
+ final String description,
+ final String helpReference,
+ final String buttonTitle,
+ final String errors,
+ final String cancelTo) {
String classSegment = " class=\"" + className + (id == null ? "\"" : "\" id=\"" + id + "\"");
request.appendHtml("<form " + classSegment + " action=\"" + action + "\" method=\"post\" accept-charset=\"UTF-8\">\n");
Modified: incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/logon/Logon.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/logon/Logon.java?rev=1357904&r1=1357903&r2=1357904&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/logon/Logon.java (original)
+++ incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/logon/Logon.java Thu Jul 5 20:52:35 2012
@@ -94,7 +94,7 @@ public class Logon extends AbstractEleme
final String formTitle = request.getOptionalProperty(FORM_TITLE);
final String loginButtonTitle = request.getOptionalProperty(BUTTON_TITLE, "Log in");
final String className = request.getOptionalProperty(CLASS, "login");
- final String id = request.getOptionalProperty(ID);
+ final String id = request.getOptionalProperty(ID, "logon");
HtmlFormBuilder.createForm(request, "logon.app", hiddenFields.toArray(new HiddenInputField[hiddenFields.size()]), fields,
className, id, formTitle, null, null, loginButtonTitle,