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/10/17 15:35:45 UTC
svn commit: r1399243 -
/incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/action/Services.java
Author: rmatthews
Date: Wed Oct 17 13:35:45 2012
New Revision: 1399243
URL: http://svn.apache.org/viewvc?rev=1399243&view=rev
Log:
ISIS-162 - services elements can have the next view specified
Modified:
incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/action/Services.java
Modified: incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/action/Services.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/Services.java?rev=1399243&r1=1399242&r2=1399243&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/action/Services.java (original)
+++ incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/action/Services.java Wed Oct 17 13:35:45 2012
@@ -25,6 +25,7 @@ import org.apache.isis.core.metamodel.ad
import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSession;
import org.apache.isis.viewer.scimpi.dispatcher.AbstractElementProcessor;
+import org.apache.isis.viewer.scimpi.dispatcher.Dispatcher;
import org.apache.isis.viewer.scimpi.dispatcher.context.RequestContext.Scope;
import org.apache.isis.viewer.scimpi.dispatcher.processor.Request;
import org.apache.isis.viewer.scimpi.dispatcher.view.field.InclusionList;
@@ -34,6 +35,7 @@ public class Services extends AbstractEl
@Override
public void process(final Request request) {
final boolean showForms = request.isRequested(FORMS, false);
+ final String view = request.getOptionalProperty(VIEW, "_generic_action." + Dispatcher.EXTENSION);
final String cancelTo = request.getOptionalProperty(CANCEL_TO);
final InclusionList inclusionList = new InclusionList();
@@ -47,7 +49,7 @@ public class Services extends AbstractEl
request.appendHtml("<h3>");
request.appendAsHtmlEncoded(adapter.titleString());
request.appendHtml("</h3>");
- Methods.writeMethods(request, serviceId, adapter, showForms, inclusionList, cancelTo);
+ Methods.writeMethods(request, serviceId, adapter, showForms, inclusionList, view, cancelTo);
request.appendHtml("</div>");
}
request.popBlockContent();