svn commit: r667017 - in /lenya/trunk/src: modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/ modules-core/sitemanagement/usecases/tab/ modules/resource/java/src/org/apache/lenya/cms/site/usecases/ modules/resource/usecases/

Author: andreas
Date: Thu Jun 12 02:47:19 2008
New Revision: 667017

URL: http://svn.apache.org/viewvc?rev=667017&view=rev
Log:
Don't show asset upload buttons if upload is disabled, show message on assets tab.

Modified:
    lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/Assets.java
    lenya/trunk/src/modules-core/sitemanagement/usecases/tab/assets.jx
    lenya/trunk/src/modules/resource/java/src/org/apache/lenya/cms/site/usecases/CreateResource.java
    lenya/trunk/src/modules/resource/usecases/create-resource.jx

Modified: lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/Assets.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/Assets.java?rev=667017&r1=667016&r2=667017&view=diff
==============================================================================
--- lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/Assets.java (original)
+++ lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/Assets.java Thu Jun 12 02:47:19 2008
@@ -24,6 +24,7 @@
 import org.apache.lenya.cms.publication.DocumentException;
 import org.apache.lenya.cms.site.SiteException;
 import org.apache.lenya.cms.site.SiteNode;
+import org.apache.lenya.util.ServletHelper;
 
 /**
  * Usecase to add Assets to a resource.
@@ -31,13 +32,13 @@
  * @version $Id$
  */
 public class Assets extends SiteUsecase {
+    
+    protected static final String PARAMETER_UPLOAD_ENABLED = "uploadEnabled";
+    protected static final String MESSAGE_UPLOAD_DISABLED = "upload-disabled";
 
-    /**
-     * @see org.apache.lenya.cms.usecase.AbstractUsecase#initParameters()
-     */
-    protected void initParameters() {
-        super.initParameters();
-
+    protected void prepareView() throws Exception {
+        super.prepareView();
+        
         if (getSourceDocument() != null) {
             try {
                 Document[] resourceDocs = getResourceDocuments();
@@ -45,6 +46,11 @@
             } catch (final Exception e) {
                 throw new RuntimeException(e);
             }
+            
+            if (!ServletHelper.isUploadEnabled(this.manager)) {
+                addErrorMessage(MESSAGE_UPLOAD_DISABLED);
+                setParameter(PARAMETER_UPLOAD_ENABLED, Boolean.FALSE);
+            }
         }
     }
 

Modified: lenya/trunk/src/modules-core/sitemanagement/usecases/tab/assets.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/sitemanagement/usecases/tab/assets.jx?rev=667017&r1=667016&r2=667017&view=diff
==============================================================================
--- lenya/trunk/src/modules-core/sitemanagement/usecases/tab/assets.jx (original)
+++ lenya/trunk/src/modules-core/sitemanagement/usecases/tab/assets.jx Thu Jun 12 02:47:19 2008
@@ -30,6 +30,8 @@
     <div id="contentblock1" class="lenya-tab-sitetree">
       
       <h1><i18n:text>Assets</i18n:text></h1>
+      
+      <jx:import uri="fallback://lenya/modules/usecase/templates/messages.jx"/>
 
       <jx:choose>
         <jx:when test="${usecase.getParameter('resourceDocuments').size() == 0}">
@@ -74,7 +76,8 @@
         </jx:otherwise>
       </jx:choose>
       
-     <jx:if test="${usecase.getParameter('document').getArea().equals('authoring')}">
+     <jx:if test="${usecase.getParameter('document').getArea().equals('authoring')
+       &amp;&amp; !usecase.getParameter('uploadEnabled').equals(Packages.java.lang.Boolean.FALSE)}">
       <form method="GET" id="form-add_asset" style="margin-top: 20px">
         <input type="hidden" name="lenya.usecase" value="resource.create"/>
         <input type="hidden" name="doctype" value="resource"/>

Modified: lenya/trunk/src/modules/resource/java/src/org/apache/lenya/cms/site/usecases/CreateResource.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/resource/java/src/org/apache/lenya/cms/site/usecases/CreateResource.java?rev=667017&r1=667016&r2=667017&view=diff
==============================================================================
--- lenya/trunk/src/modules/resource/java/src/org/apache/lenya/cms/site/usecases/CreateResource.java (original)
+++ lenya/trunk/src/modules/resource/java/src/org/apache/lenya/cms/site/usecases/CreateResource.java Thu Jun 12 02:47:19 2008
@@ -34,6 +34,7 @@
 public class CreateResource extends CreateDocument {
 
     protected static final String PARAMETER_FILE = "file";
+    protected static final String PARAMETER_CAN_SUBMIT = "canSubmit";
     
     protected static final String MESSAGE_UPLOAD_DISABLED = "upload-disabled";
     protected static final String MESSAGE_UPLOAD_ENTER_TITLE = "upload-enter-title";
@@ -44,8 +45,9 @@
 
     protected void doCheckPreconditions() throws Exception {
         super.doCheckPreconditions();
-        if (!ServletHelper.isUploadEnabled(manager)) {
+        if (!ServletHelper.isUploadEnabled(this.manager)) {
             addErrorMessage(MESSAGE_UPLOAD_DISABLED);
+            setParameter(PARAMETER_CAN_SUBMIT, Boolean.FALSE);
         }
     }
 

Modified: lenya/trunk/src/modules/resource/usecases/create-resource.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/resource/usecases/create-resource.jx?rev=667017&r1=667016&r2=667017&view=diff
==============================================================================
--- lenya/trunk/src/modules/resource/usecases/create-resource.jx (original)
+++ lenya/trunk/src/modules/resource/usecases/create-resource.jx Thu Jun 12 02:47:19 2008
@@ -39,7 +39,7 @@
       </i18n:translate>
     </div>
     <div class="lenya-box-body">
-      <form method="POST" enctype="multipart/form-data" id="form-add_asset">
+      <form method="POST" enctype="multipart/form-data" id="form-add_asset" action="${usecase.getSourceURL()}">
         <input type="hidden" name="lenya.usecase" value="${usecase.getName()}"/>
         <input type="hidden" name="lenya.continuation" value="${continuation.id}"/>
         <table class="lenya-table-noborder">
@@ -56,8 +56,10 @@
           <jx:import uri="fallback://lenya/modules/sitemanagement/usecases/site/createFields.jx"/>
           <tr>
             <td colspan="2">
-              <input i18n:attr="value" name="submit" type="submit" value="New Asset"/>
-              &#160;
+              <jx:if test="${!usecase.getParameter('canSubmit').equals(Packages.java.lang.Boolean.FALSE)}">
+                <input i18n:attr="value" name="submit" type="submit" value="New Asset"/>
+                &#160;
+              </jx:if>
               <input i18n:attr="value" name="cancel" type="submit" value="Cancel"/>
             </td>
           </tr>