[richfaces-svn-commits] JBoss Rich Faces SVN: r13752 - in trunk/examples/photoalbum: web/src/main/webapp/includes/album and 2 other directories.

[richfaces-svn-commits at lists.jboss.org]

Author: Alex.Kolonitsky
Date: 2009-04-22 04:37:54 -0400 (Wed, 22 Apr 2009)
New Revision: 13752

Modified:
   trunk/examples/photoalbum/ejb/src/main/java/org/richfaces/photoalbum/domain/Album.java
   trunk/examples/photoalbum/web/src/main/webapp/includes/album/albumEditInfo.xhtml
   trunk/examples/photoalbum/web/src/main/webapp/includes/image/imageEditInfo.xhtml
   trunk/examples/photoalbum/web/src/main/webapp/includes/shelf/shelfEditInfo.xhtml
Log:
realworld/shelfs, albums: Validation message doesn't appear in case incorrect data in calendar input field
https://jira.jboss.org/jira/browse/RF-6849

Modified: trunk/examples/photoalbum/ejb/src/main/java/org/richfaces/photoalbum/domain/Album.java
===================================================================
--- trunk/examples/photoalbum/ejb/src/main/java/org/richfaces/photoalbum/domain/Album.java	2009-04-22 00:56:37 UTC (rev 13751)
+++ trunk/examples/photoalbum/ejb/src/main/java/org/richfaces/photoalbum/domain/Album.java	2009-04-22 08:37:54 UTC (rev 13752)
@@ -43,6 +43,9 @@
 import org.hibernate.validator.Length;
 import org.hibernate.validator.NotEmpty;
 import org.hibernate.validator.NotNull;
+import org.hibernate.annotations.Fetch;
+import org.hibernate.annotations.FetchMode;
+import org.hibernate.annotations.ForeignKey;
 import org.jboss.seam.ScopeType;
 import org.jboss.seam.annotations.AutoCreate;
 import org.jboss.seam.annotations.Name;
@@ -77,13 +80,13 @@
     private String description;
 
     @OneToMany(cascade = CascadeType.ALL, mappedBy = "album")
-    @org.hibernate.annotations.Fetch(org.hibernate.annotations.FetchMode.SUBSELECT)
+    @Fetch(FetchMode.SUBSELECT)
     private List<Image> images = new ArrayList<Image>();
 
     @NotNull
     @ManyToOne(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
     @JoinColumn(name = "SHELF_ID", nullable = false)
-    @org.hibernate.annotations.ForeignKey(name = "FK_SHELF_ID")
+    @ForeignKey(name = "FK_SHELF_ID")
     private Shelf shelf;
 
     @Temporal(TemporalType.TIMESTAMP)

Modified: trunk/examples/photoalbum/web/src/main/webapp/includes/album/albumEditInfo.xhtml
===================================================================
(Binary files differ)

Modified: trunk/examples/photoalbum/web/src/main/webapp/includes/image/imageEditInfo.xhtml
===================================================================
(Binary files differ)

Modified: trunk/examples/photoalbum/web/src/main/webapp/includes/shelf/shelfEditInfo.xhtml
===================================================================
--- trunk/examples/photoalbum/web/src/main/webapp/includes/shelf/shelfEditInfo.xhtml	2009-04-22 00:56:37 UTC (rev 13751)
+++ trunk/examples/photoalbum/web/src/main/webapp/includes/shelf/shelfEditInfo.xhtml	2009-04-22 08:37:54 UTC (rev 13752)
@@ -12,44 +12,65 @@
 					#{messages['shelf_name']}
 				</td>
 				<td valign="top" colspan="2">
-					<h:inputText value="#{model.selectedShelf.name}" styleClass="shelf-edit-input" />
+					<h:inputText id="shelf_name"
+								 value="#{model.selectedShelf.name}"
+								 styleClass="shelf-edit-input"
+								 required="true"/>
 				</td>
 			</tr>
 			<tr>
+				<td style="padding:0; margin:0;" />
+				<td style="padding:0; margin:0;" ><rich:message for="shelf_name" /></td>
+			</tr>
+			<tr>
 				<td valign="top" nowrap="true"  style="padding-top : 8px">
 					#{messages['creation_date']}
 				</td>
 				<td valign="top">
 					<a4j:outputPanel id="calendar" layout="block">
-						<rich:calendar styleClass="shelf-edit-calendar" enableManualInput="true" value="#{model.selectedShelf.created}"
-							cellWidth="24px" cellHeight="22px">
+						<rich:calendar id="shelf_date"
+									   styleClass="shelf-edit-calendar"
+									   enableManualInput="true"
+									   value="#{model.selectedShelf.created}"
+									   cellWidth="24px"
+									   cellHeight="22px">
+							<rich:ajaxValidator event="onchange"/>
 						</rich:calendar>
 					</a4j:outputPanel>
 					<rich:message for="calendar" />
 				</td>
 			</tr>
 			<tr>
+				<td style="padding:0; margin:0;" />
+				<td style="padding:0; margin:0;" ><rich:message for="shelf_date" /></td>
+			</tr>
+			<tr>
 				<td valign="top" nowrap="true"  style="padding-top : 8px">
 					#{messages['description']}
 				</td>
 				<td valign="top" colspan="2">
-					<h:inputTextarea value="#{model.selectedShelf.description}" styleClass="shelf-edit-area" />
+					<h:inputTextarea id="shelf_description"
+									 value="#{model.selectedShelf.description}"
+									 styleClass="shelf-edit-area" />
 				</td>
 			</tr>
 			<tr>
+				<td style="padding:0; margin:0;" />
+				<td style="padding:0; margin:0;" ><rich:message for="shelf_description" /></td>
+			</tr>
+			<tr>
 				<td valign="top" nowrap="true"  style="padding-top : 8px">
 					<h:outputText value="#{messages['album.shared']}" />
 				</td>
 				<td valign="top">
 					<h:selectBooleanCheckbox styleClass="selectBooleanCheckbox"
-							id="shared" value="#{model.selectedShelf.shared}"/>
+											 id="shared"
+											 value="#{model.selectedShelf.shared}"/>
 					<rich:message for="shared" />
 				</td>
 			</tr>
 			<tr>
 				<td valign="top">
-
-
 				</td>
 				<td valign="top" align="right" colspan="2" style="padding : 10px;">
 					<richx:commandButton id="saveButton" style="float: left" value="#{messages['save']}" actionListener="#{shelfManager.editShelf(model.selectedShelf)}" reRender="mainArea" />