Author: andrei_exadel Date: 2009-03-10 07:58:49 -0400 (Tue, 10 Mar 2009) New Revision: 12901 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/RenderLogic.java trunk/test-applications/realworld2/web/src/main/webapp/includes/misc/errorPanel.xhtml trunk/test-applications/realworld2/web/src/main/webapp/layout/template3.xhtml Log: Add error modal panel 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-10 10:28:21 UTC (rev 12900) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/ConversationState.java 2009-03-10 11:58:49 UTC (rev 12901) @@ -358,6 +358,10 @@ setSelectedImageIndex(index+1); } + public void generateError() { + Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, new Exception("Is not implemented yet!")); + } + public User getSelectedUser() { return selectedUser; } Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/RenderLogic.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/RenderLogic.java 2009-03-10 10:28:21 UTC (rev 12900) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/RenderLogic.java 2009-03-10 11:58:49 UTC (rev 12901) @@ -105,7 +105,7 @@ } public boolean isUserAlbum(Album album){ - if(album == null){ + if(album == null || album.getOwner() == null){ return false; } return album.getOwner().equals(user); Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/misc/errorPanel.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld2/web/src/main/webapp/layout/template3.xhtml =================================================================== (Binary files differ)