[jboss-cvs] jboss-seam/examples/wiki/src/etc/WEB-INF ...

[Christian Bauer]

  User: cbauer  
  Date: 07/03/09 03:02:09

  Modified:    examples/wiki/src/etc/WEB-INF  pages.xml
  Log:
  Fixed file uploading
  
  Revision  Changes    Path
  1.4       +18 -23    jboss-seam/examples/wiki/src/etc/WEB-INF/pages.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: pages.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/etc/WEB-INF/pages.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- pages.xml	8 Mar 2007 17:50:59 -0000	1.3
  +++ pages.xml	9 Mar 2007 08:02:09 -0000	1.4
  @@ -1,7 +1,8 @@
   <?xml version="1.0" encoding="UTF-8"?>
   <!DOCTYPE pages PUBLIC "-//Seam/Seam Pages DTD 1.2//EN" "http://jboss.com/products/seam/pages-1.2.dtd">
   
  -<pages login-view-id="/loginRequired.xhtml">
  +<pages login-view-id="/loginRequired.xhtml"
  +        no-conversation-view-id="/dirDisplay.xhtml">
   
       <page view-id="/display.xhtml" action="#{browser.prepare}">
           <param name="nodeId" value="#{browser.nodeId}"/>
  @@ -55,8 +56,8 @@
   
       </page>
   
  -    <page view-id="/docEdit.xhtml" login-required="true" no-conversation-view-id="/message.xhtml">
  -        <description>Edit Document '#{currentNode.name}'</description>
  +    <page view-id="/docEdit.xhtml" login-required="true" >
  +        <description>Edit Document '#{documentHome.instance.name}'</description>
   
           <restrict/>
   
  @@ -79,7 +80,7 @@
   
       </page>
   
  -    <page view-id="/docHistory.xhtml" login-required="false" no-conversation-view-id="/message.xhtml">
  +    <page view-id="/docHistory.xhtml" login-required="false">
           <description>Document History '#{currentNode.name}'</description>
   
           <navigation>
  @@ -137,8 +138,8 @@
   
       </page>
   
  -    <page view-id="/dirEdit.xhtml" login-required="true" no-conversation-view-id="/dirDisplay.xhtml">
  -        <description>Edit Directory '#{currentNode.name}'</description>
  +    <page view-id="/dirEdit.xhtml" login-required="true">
  +        <description>Edit Directory '#{directoryHome.instance.name}'</description>
           <restrict/>
   
           <navigation from-action="#{directoryHome.remove}">
  @@ -152,9 +153,13 @@
   
       </page>
   
  -    <page view-id="/fileEdit.xhtml" login-required="false" no-conversation-view-id="/dirDisplay.xhtml">
  -        <description>Edit File '#{currentNode.name}'</description>
  +    <page view-id="/fileEdit.xhtml" login-required="true">
  +        <description>Edit File '#{fileHome.instance.name}'</description>
  +        <restrict/>
   
  +        <!-- TODO: If this is a nested conversation we really want to exit to the parent view after persist(),
  +             e.g. editDoc -> uploadFile -> editDoc instead of currently editDoc -> uploadFile -> dirDisplay
  +             This needs navigation actions or the already required polymorphic exitConversation() feature -->
           <navigation from-action="#{fileHome.remove}">
               <rule>
                   <end-conversation/>
  @@ -164,29 +169,18 @@
               </rule>
           </navigation>
   
  -        <!-- TODO: bug in file upload rendering vs. redirect, http://jira.jboss.com/jira/browse/JBSEAM-948 -->
  -        <navigation from-action="#{fileHome.persist}">
  -            <!-- TODO: If this is a nested conversation we really want to exit to the parent view after persist(),
  -                 e.g. editDoc -> uploadFile -> editDoc instead of currently editDoc -> uploadFile -> dirDisplay -->
  -            <rule>
  -                <redirect view-id="/dirDisplay.xhtml">
  -                    <param name="nodeId" value="#{fileHome.parentDirectory.id}"/>
  -                </redirect>
  -            </rule>
  -        </navigation>
  -
       </page>
   
  -    <page view-id="/userAccount.xhtml" no-conversation-view-id="/message.xhtml">
  +    <page view-id="/userAccount.xhtml">
           <description>Managing Member Account '#{userHome.instance.username}'</description>
       </page>
  -    <page view-id="/userProfile.xhtml" no-conversation-view-id="/message.xhtml">
  +    <page view-id="/userProfile.xhtml">
           <description>Managing Member Profile '#{userHome.instance.username}'</description>
       </page>
  -    <page view-id="/userPrefs.xhtml" no-conversation-view-id="/message.xhtml">
  +    <page view-id="/userPrefs.xhtml">
           <description>Managing Member Preferences '#{userHome.instance.username}'</description>
       </page>
  -    <page view-id="/userList.xhtml" no-conversation-view-id="/message.xhtml">
  +    <page view-id="/userList.xhtml">
           <description>Searching Members (Results: #{userSearch.rowCount})</description>
       </page>
   
  @@ -259,6 +253,7 @@
       <!-- These effectively "block" the user from navigating forward, he stays on the last browsed page and
            gets an error message. -->
       <page view-id="/loginRequired.xhtml" action="#{browser.redirectToLastBrowsedPageWithConversation}"/>
  +
       <page view-id="/permissionError.xhtml" action="#{browser.redirectToLastBrowsedPageWithConversation}"/>
       
       <exception class="org.jboss.seam.security.AuthorizationException">