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:51:57 UTC

svn commit: r1357903 - /incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/AbstractFormView.java

Author: rmatthews
Date: Thu Jul  5 20:51:57 2012
New Revision: 1357903

URL: http://svn.apache.org/viewvc?rev=1357903&view=rev
Log:
ISIS-162 - Incorporate ids into all forms. 

Modified:
    incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/AbstractFormView.java

Modified: incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/AbstractFormView.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/display/AbstractFormView.java?rev=1357903&r1=1357902&r2=1357903&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/AbstractFormView.java (original)
+++ incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/AbstractFormView.java Thu Jul  5 20:51:57 2012
@@ -42,19 +42,19 @@ public abstract class AbstractFormView e
 
     @Override
     public void process(final Request request, final ObjectAdapter object) {
-        final String cls = request.getOptionalProperty(CLASS, "form");
-        final String id = request.getOptionalProperty(ID, object.getSpecification().getShortIdentifier());
-        final String classString = " id=\"" + id + "\" class=\"" + cls + "\"";
-        String title = request.getOptionalProperty(FORM_TITLE);
-        final String oddRowClass = request.getOptionalProperty(ODD_ROW_CLASS);
-        final String evenRowClass = request.getOptionalProperty(EVEN_ROW_CLASS);
-        final boolean showIcons = request.isRequested(SHOW_ICON, showIconByDefault());
-
         final LinkedFieldsBlock tag = new LinkedFieldsBlock();
         request.setBlockContent(tag);
         request.processUtilCloseTag();
 
         if (object != null) {
+            final String id = request.getOptionalProperty(ID, object.getSpecification().getShortIdentifier()); 
+            final String cls = request.getOptionalProperty(CLASS, "form");
+            final String classString = " id=\"" + id + "\" class=\"" + cls + "\"";
+            String title = request.getOptionalProperty(FORM_TITLE);
+            final String oddRowClass = request.getOptionalProperty(ODD_ROW_CLASS);
+            final String evenRowClass = request.getOptionalProperty(EVEN_ROW_CLASS);
+            final boolean showIcons = request.isRequested(SHOW_ICON, true); 
+
             final AuthenticationSession session = IsisContext.getAuthenticationSession(); 
             List<ObjectAssociation> associations = object.getSpecification().getAssociations(ObjectAssociationFilters.dynamicallyVisible(session, object));
             final List<ObjectAssociation> fields = tag.includedFields(associations);