Author: amarkhel Date: 2009-03-23 09:40:27 -0400 (Mon, 23 Mar 2009) New Revision: 13099 Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/Controller.java trunk/test-applications/realworld2/web/src/main/webapp/includes/album/albumEditInfo.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/image/imageInfo.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/shelf/shelfEditInfo.xhtml Log: Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/Controller.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/Controller.java 2009-03-23 13:31:03 UTC (rev 13098) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/Controller.java 2009-03-23 13:40:27 UTC (rev 13099) @@ -124,7 +124,7 @@ if(image == null || image.getAlbum() == null || image.getAlbum().getOwner() == null){ return false; } - return image.getAlbum().getOwner().equals(user); + return image.getAlbum().getOwner().getLogin().equals(user.getLogin()); } public void startEditAlbum(Album album){ Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/album/albumEditInfo.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/image/imageInfo.xhtml =================================================================== (Binary files differ) 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-03-23 13:31:03 UTC (rev 13098) +++ trunk/test-applications/realworld2/web/src/main/webapp/includes/shelf/shelfEditInfo.xhtml 2009-03-23 13:40:27 UTC (rev 13099) @@ -48,4 +48,7 @@ </tr> </table> </div> + <ui:include src="/includes/album/albumsList.xhtml"> + <ui:param name="albums" value="#{shelf.albums}" /> + </ui:include> </ui:composition> \ No newline at end of file