Update of 
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/WEB-INF
In directory 
james.mmbase.org:/tmp/cvs-serv10578/contentrepository/src/webapp/WEB-INF

Modified Files:
        struts-repository.xml 
Log Message:
CMSC-1208 Can delete attachements in channel with insuficient rights


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/WEB-INF
See also: http://www.mmbase.org/jira/browse/CMSC-1208


Index: struts-repository.xml
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/WEB-INF/struts-repository.xml,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- struts-repository.xml       6 Jan 2009 07:59:42 -0000       1.31
+++ struts-repository.xml       9 Jan 2009 03:32:26 -0000       1.32
@@ -12,7 +12,6 @@
       <form-bean name="SearchForm" 
type="com.finalist.cmsc.repository.forms.SearchForm" />
       <form-bean name="AssetSearchForm" 
type="com.finalist.cmsc.repository.forms.AssetSearchForm" />
       <form-bean name="ImageForm" 
type="com.finalist.cmsc.resources.forms.ImageForm" />
-      <form-bean name="AttachmentForm" 
type="com.finalist.cmsc.resources.forms.AttachmentForm" />
       <form-bean name="UrlForm" 
type="com.finalist.cmsc.resources.forms.UrlForm" />
       <form-bean name="DeleteSecondaryContentForm" 
type="com.finalist.cmsc.resources.forms.DeleteSecondaryContentForm" />
       <form-bean name="SecondaryEditForm" 
type="com.finalist.cmsc.resources.forms.SecondaryEditForm" />
@@ -149,15 +148,6 @@
          name="ImageForm" scope="request" 
input="/editors/resources/imagesearch.jsp" unknown="false" validate="true">
       </action>
 
-      <action path="/editors/resources/AttachmentInitAction" 
type="com.finalist.cmsc.resources.forms.AttachmentInitAction"
-         name="AttachmentForm" scope="request" unknown="false" 
validate="false">
-         <forward name="searchoptions" 
path="/editors/resources/attachmentsearch.jsp" redirect="false" />
-         <forward name="dosearch" 
path="/editors/resources/AttachmentAction.do" redirect="false" />
-      </action>
-      <action path="/editors/resources/AttachmentAction" 
type="com.finalist.cmsc.resources.forms.AttachmentAction"
-         name="AttachmentForm" scope="request" 
input="/editors/resources/attachmentsearch.jsp" unknown="false" validate="true">
-      </action>
-
       <action path="/editors/resources/UrlInitAction" 
type="com.finalist.cmsc.resources.forms.UrlInitAction"
          name="UrlForm" scope="request" unknown="false" validate="false">
          <forward name="searchoptions" path="/editors/resources/urlsearch.jsp" 
redirect="false" />
@@ -230,9 +220,13 @@
       <action path="/editors/repository/AssetSearchAction" 
type="com.finalist.cmsc.repository.forms.AssetSearchAction"
          name="AssetSearchForm" scope="request" 
input="/editors/repository/assetsearch.jsp" unknown="false" validate="true">
       </action>
+      <action path="/editors/repository/InsertAssetSearchAction" 
type="com.finalist.cmsc.repository.forms.InsertAssetSearchAction"
+         name="AssetSearchForm" scope="request" 
input="/editors/resources/attachmentsearch.jsp" unknown="false" validate="true">
+      </action>
       <action path="/editors/repository/AssetUploadAction" 
type="com.finalist.cmsc.repository.forms.AssetUploadAction" 
          name="AssetUploadForm" unknown="false" validate="true">
          <forward name="success" path="/editors/repository/Asset.do" 
redirect="true" />
+         <forward name="insertAsset" 
path="/editors/resources/attachmentupload.jsp?insertAsset=insertAsset" 
redirect="true" />
       </action>
       <action path="/editors/repository/AssetDeleteAction"
          type="com.finalist.cmsc.repository.forms.AssetDeleteAction" 
unknown="false" validate="false">
@@ -271,6 +265,7 @@
          name="AssetSearchForm" scope="request" unknown="false" 
validate="false">
          <forward name="searchoptions" 
path="/editors/repository/assetsearch.jsp" redirect="false" />
          <forward name="dosearch" 
path="/editors/repository/AssetSearchAction.do" redirect="false" />
+         <forward name="insertAsset" 
path="/editors/resources/attachmentsearch.jsp" redirect="false" />
       </action>
    </action-mappings>
 
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs

Reply via email to