Author: amarkhel Date: 2009-04-17 09:54:46 -0400 (Fri, 17 Apr 2009) New Revision: 13638 Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/shelf/shelfEditInfo.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/shelfEdit.xhtml Log: Fix RF 6838 Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/shelf/shelfEditInfo.xhtml =================================================================== --- trunk/test-applications/realworld2/web/src/main/webapp/includes/shelf/shelfEditInfo.xhtml 2009-04-17 13:45:32 UTC (rev 13637) +++ trunk/test-applications/realworld2/web/src/main/webapp/includes/shelf/shelfEditInfo.xhtml 2009-04-17 13:54:46 UTC (rev 13638) @@ -12,7 +12,7 @@ #{messages['shelf_name']} </td> <td valign="top" colspan="2"> - <h:inputText value="#{shelf.name}" styleClass="shelf-edit-input" /> + <h:inputText value="#{model.selectedShelf.name}" styleClass="shelf-edit-input" /> </td> </tr> <tr> @@ -21,7 +21,7 @@ </td> <td valign="top"> <a4j:outputPanel id="calendar" layout="block"> - <rich:calendar styleClass="shelf-edit-calendar" enableManualInput="true" value="#{shelf.created}" + <rich:calendar styleClass="shelf-edit-calendar" enableManualInput="true" value="#{model.selectedShelf.created}" cellWidth="24px" cellHeight="22px"> </rich:calendar> </a4j:outputPanel> @@ -33,7 +33,7 @@ #{messages['description']} </td> <td valign="top" colspan="2"> - <h:inputTextarea value="#{shelf.description}" styleClass="shelf-edit-area" /> + <h:inputTextarea value="#{model.selectedShelf.description}" styleClass="shelf-edit-area" /> </td> </tr> <tr> @@ -42,7 +42,7 @@ </td> <td valign="top"> <h:selectBooleanCheckbox styleClass="selectBooleanCheckbox" - id="shared" value="#{shelf.shared}"/> + id="shared" value="#{model.selectedShelf.shared}"/> <rich:message for="shared" /> </td> </tr> @@ -53,12 +53,12 @@ </td> <td valign="top" align="right" colspan="2" style="padding : 10px;"> <richx:commandButton id="cancelButton" value="#{messages['cancel']}" style="float: left" immediate="true" actionListener="#{controller.cancelEditShelf()}" reRender="mainArea" /> - <richx:commandButton id="saveButton" value="#{messages['save']}" actionListener="#{shelfManager.editShelf(shelf)}" reRender="mainArea" /> + <richx:commandButton id="saveButton" value="#{messages['save']}" actionListener="#{shelfManager.editShelf(model.selectedShelf)}" reRender="mainArea" /> </td> </tr> </table> </div> <ui:include src="/includes/album/albumsList.xhtml"> - <ui:param name="albums" value="#{shelf.albums}" /> + <ui:param name="albums" value="#{model.selectedShelf.albums}" /> </ui:include> </ui:composition> \ No newline at end of file Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/shelfEdit.xhtml =================================================================== (Binary files differ)