Return-Path: X-Original-To: apmail-incubator-isis-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-isis-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0010ECD1F for ; Thu, 5 Jul 2012 20:59:28 +0000 (UTC) Received: (qmail 61870 invoked by uid 500); 5 Jul 2012 20:59:28 -0000 Delivered-To: apmail-incubator-isis-commits-archive@incubator.apache.org Received: (qmail 61855 invoked by uid 500); 5 Jul 2012 20:59:28 -0000 Mailing-List: contact isis-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: isis-dev@incubator.apache.org Delivered-To: mailing list isis-commits@incubator.apache.org Received: (qmail 61848 invoked by uid 99); 5 Jul 2012 20:59:28 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 05 Jul 2012 20:59:28 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 05 Jul 2012 20:59:27 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 58F7F23888CD; Thu, 5 Jul 2012 20:59:08 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1357908 - /incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/AbstractFormView.java Date: Thu, 05 Jul 2012 20:59:08 -0000 To: isis-commits@incubator.apache.org From: rmatthews@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120705205908.58F7F23888CD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rmatthews Date: Thu Jul 5 20:59:07 2012 New Revision: 1357908 URL: http://svn.apache.org/viewvc?rev=1357908&view=rev Log: ISIS-162 - Now if no object exists the form is simply not rendered (so no error is generated). 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=1357908&r1=1357907&r2=1357908&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:59:07 2012 @@ -43,8 +43,6 @@ public abstract class AbstractFormView e @Override public void process(final Request request, final ObjectAdapter object) { final LinkedFieldsBlock tag = new LinkedFieldsBlock(); - request.setBlockContent(tag); - request.processUtilCloseTag(); if (object != null) { final String id = request.getOptionalProperty(ID, object.getSpecification().getShortIdentifier()); @@ -55,6 +53,9 @@ public abstract class AbstractFormView e final String evenRowClass = request.getOptionalProperty(EVEN_ROW_CLASS); final boolean showIcons = request.isRequested(SHOW_ICON, true); + request.setBlockContent(tag); + request.processUtilCloseTag(); + final AuthenticationSession session = IsisContext.getAuthenticationSession(); List associations = object.getSpecification().getAssociations(ObjectAssociationFilters.dynamicallyVisible(session, object)); final List fields = tag.includedFields(associations); @@ -77,8 +78,10 @@ public abstract class AbstractFormView e } write(request, object, fields, linkFields, classString, title, oddRowClass, evenRowClass, showIcons); + request.popBlockContent(); + } else { + request.skipUntilClose(); } - request.popBlockContent(); } private void write(final Request request, final ObjectAdapter object, final List fields, final LinkedObject[] linkFields, final String classString, final String title, final String oddRowClass, final String evenRowClass, final boolean showIcons) {