[richfaces-svn-commits] JBoss Rich Faces SVN: r12891 - in trunk/test-applications/realworld2/web/src/main: java/org/richfaces/realworld/navigation and 3 other directories.

Author: alevkovsky Date: 2009-03-09 10:33:16 -0400 (Mon, 09 Mar 2009) New Revision: 12891 Added: trunk/test-applications/realworld2/web/src/main/webapp/includes/album/userAlbumEditBlock.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/userAlbumEdit.xhtml Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/AlbumManager.java trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/navigation/NavigationEnum.java trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/ConversationState.java trunk/test-applications/realworld2/web/src/main/webapp/includes/userAlbum.xhtml Log: Realworld: add album edit murkup Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/AlbumManager.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/AlbumManager.java 2009-03-09 14:02:08 UTC (rev 12890) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/AlbumManager.java 2009-03-09 14:33:16 UTC (rev 12891) @@ -37,6 +37,7 @@ import org.richfaces.realworld.domain.Shelf; import org.richfaces.realworld.domain.User; import org.richfaces.realworld.fileupload.FileManager; +import org.richfaces.realworld.navigation.NavigationEnum; import org.richfaces.realworld.service.Constants; import org.richfaces.realworld.service.IAlbumAction; import org.richfaces.realworld.util.ConversationState; @@ -94,7 +95,8 @@ public void editAlbum(Album album){ albumAction.editAlbum(album); - conversationState.setSelectedAlbum(album); + conversationState.setSelectedAlbum(album); + Events.instance().raiseEvent(Constants.UPDATE_MAIN_AREA_EVENT, NavigationEnum.ALBUM_PREVIEW); Events.instance().raiseEvent("albumEdited"); } Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/navigation/NavigationEnum.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/navigation/NavigationEnum.java 2009-03-09 14:02:08 UTC (rev 12890) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/navigation/NavigationEnum.java 2009-03-09 14:33:16 UTC (rev 12891) @@ -34,7 +34,8 @@ TAGS("includes/tag.xhtml"), ALL_ALBUMS("/includes/userAlbums.xhtml"), ALL_IMAGES("/includes/userImages.xhtml"), - ALBUM_IMAGE_EDIT("/includes/userImageEdit.xhtml"); + ALBUM_IMAGE_EDIT("/includes/userImageEdit.xhtml"), + ALBUM_EDIT("/includes/userAlbumEdit.xhtml"); private NavigationEnum(String t){ Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/ConversationState.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/ConversationState.java 2009-03-09 14:02:08 UTC (rev 12890) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/ConversationState.java 2009-03-09 14:33:16 UTC (rev 12891) @@ -254,12 +254,20 @@ } public void cancelEditImage(Image image){ - if(!image.getAlbum().isShared() && !image.getAlbum().getOwner().equals(user)){ + Events.instance().raiseEvent(Constants.UPDATE_MAIN_AREA_EVENT, NavigationEnum.ALBUM_IMAGE_PREVIEW); + } + + public void editAlbum(Album album){ + if(album.getOwner().equals(user)){ Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, new Exception(HAVENT_ACCESS)); return; } - Events.instance().raiseEvent(Constants.UPDATE_MAIN_AREA_EVENT, NavigationEnum.ALBUM_IMAGE_PREVIEW); + Events.instance().raiseEvent(Constants.UPDATE_MAIN_AREA_EVENT, NavigationEnum.ALBUM_EDIT); } + + public void cancelEditAlbum(Album album){ + Events.instance().raiseEvent(Constants.UPDATE_MAIN_AREA_EVENT, NavigationEnum.ALBUM_PREVIEW); + } public void selectMyAlbums(){ setSelectedAlbum(null); Added: trunk/test-applications/realworld2/web/src/main/webapp/includes/album/userAlbumEditBlock.xhtml =================================================================== (Binary files differ) Property changes on: trunk/test-applications/realworld2/web/src/main/webapp/includes/album/userAlbumEditBlock.xhtml ___________________________________________________________________ Name: svn:mime-type + application/xhtml+xml Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/userAlbum.xhtml =================================================================== (Binary files differ) Added: trunk/test-applications/realworld2/web/src/main/webapp/includes/userAlbumEdit.xhtml =================================================================== (Binary files differ) Property changes on: trunk/test-applications/realworld2/web/src/main/webapp/includes/userAlbumEdit.xhtml ___________________________________________________________________ Name: svn:mime-type + application/xhtml+xml