You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by hl...@apache.org on 2011/10/03 23:22:08 UTC
svn commit: r1178582 - in /tapestry/tapestry5/trunk/tapestry-core/src/main:
java/org/apache/tapestry5/corelib/pages/PageCatalog.java
resources/org/apache/tapestry5/corelib/pages/PageCatalog.tml
Author: hlship
Date: Mon Oct 3 21:22:07 2011
New Revision: 1178582
URL: http://svn.apache.org/viewvc?rev=1178582&view=rev
Log:
TAP5-1678: Store the selected page in the drop down list persistently, and adjust some formatting
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/pages/PageCatalog.java
tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry5/corelib/pages/PageCatalog.tml
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/pages/PageCatalog.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/pages/PageCatalog.java?rev=1178582&r1=1178581&r2=1178582&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/pages/PageCatalog.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/pages/PageCatalog.java Mon Oct 3 21:22:07 2011
@@ -72,6 +72,7 @@ public class PageCatalog
@Property
@Validate("required")
+ @Persist
private String pageName;
@Inject
@@ -95,6 +96,8 @@ public class PageCatalog
return null;
}
+ pageName = null;
+
componentInstantiatorSource.forceComponentInvalidation();
alertManager.info("Forced a component class reload.");
@@ -171,7 +174,13 @@ public class PageCatalog
{
alertManager.error(String.format("Page %s failed to load.", name));
failures.add(name);
- fail = ex;
+
+ if (fail == null)
+ {
+ pageName = name;
+ fail = ex;
+ }
+
break;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry5/corelib/pages/PageCatalog.tml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry5/corelib/pages/PageCatalog.tml?rev=1178582&r1=1178581&r2=1178582&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry5/corelib/pages/PageCatalog.tml (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry5/corelib/pages/PageCatalog.tml Mon Oct 3 21:22:07 2011
@@ -51,15 +51,12 @@
</t:zone>
- <div class="t-space-vertically">
+ <t:form t:id="singlePageLoad" zone="pages">
- <t:form t:id="singlePageLoad" zone="pages">
+ <t:label for="pageName">Load single page</t:label>
+ <t:select t:id="pageName" model="pageNames"/>
+ <input type="submit" value="Load Page"/>
- <t:label for="pageName">Load single page</t:label>
- <t:select t:id="pageName" model="pageNames"/>
- <input type="submit" value="Load Page"/>
-
- </t:form>
- </div>
+ </t:form>
</i:internallayout>
\ No newline at end of file