[MMBASE CVS] contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms AttachmentUploadAction.java HighFrequencyAssetAction.java ImageUploadAction.java

[billyxie]

Update of 
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms
In directory 
james.mmbase.org:/tmp/cvs-serv23624/contentrepository/src/java/com/finalist/cmsc/repository/forms

Modified Files:
      Tag: b1_6
        AttachmentUploadAction.java HighFrequencyAssetAction.java 
        ImageUploadAction.java 
Log Message:
CMSC-1280 - Assets: Relate attachment to content element - New search screen


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms
See also: http://www.mmbase.org/jira/browse/CMSC-1280


Index: AttachmentUploadAction.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/AttachmentUploadAction.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -b -r1.2 -r1.2.2.1
--- AttachmentUploadAction.java 20 Feb 2009 02:17:57 -0000      1.2
+++ AttachmentUploadAction.java 18 Mar 2009 03:53:37 -0000      1.2.2.1
@@ -13,11 +13,13 @@
 import org.mmbase.bridge.Cloud;
 import org.mmbase.bridge.NodeManager;
 
+import com.finalist.cmsc.repository.RepositoryUtil;
 import com.finalist.util.http.BulkUploadUtil;
 
 public class AttachmentUploadAction extends AbstractUploadAction {
    
    private static final String ALL = "all";
+   private static final String SITEASSETS = "siteassets";
    private static final String CREATION = "creation";
    
    @Override
@@ -33,7 +35,9 @@
       String exceed = "yes";
       int nodeId = 0;
 
-      if (parentchannel.equalsIgnoreCase(ALL) || 
StringUtils.isEmpty(parentchannel)) {
+      if (parentchannel.equalsIgnoreCase(SITEASSETS)) {
+         parentchannel = RepositoryUtil.getRoot(cloud);
+      } else if (parentchannel.equalsIgnoreCase(ALL) || 
StringUtils.isEmpty(parentchannel)) {
          parentchannel = (String) request.getSession().getAttribute(CREATION);
       }
       int fileSize = file.getFileSize();


Index: HighFrequencyAssetAction.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/HighFrequencyAssetAction.java,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -b -r1.4.2.2 -r1.4.2.3
--- HighFrequencyAssetAction.java       17 Mar 2009 07:15:51 -0000      1.4.2.2
+++ HighFrequencyAssetAction.java       18 Mar 2009 03:53:37 -0000      1.4.2.3
@@ -57,7 +57,7 @@
    private static final String IMAGES = "images";
    private static final String URLS = "urls";
    private static final String ALL = "all";
-   private static final String SITEIMAGES = "siteimages";
+   private static final String SITEASSETS = "siteassets";
    private static final String CREATION = "creation";
    private static final String CONTENTELEMENT = "contentelement";
    private static final String SOURCE = "source";
@@ -76,7 +76,7 @@
       HighFrequencyAssetForm highFrequencyAssetForm = (HighFrequencyAssetForm) 
form;
 
       String channelid = highFrequencyAssetForm.getChannelid();
-      boolean existChannelConstraint = StringUtils.isNotEmpty(channelid) && 
!ALL.equals(channelid) && !SITEIMAGES.equals(channelid);
+      boolean existChannelConstraint = StringUtils.isNotEmpty(channelid) && 
!ALL.equals(channelid) && !SITEASSETS.equals(channelid);
       String imageShow = highFrequencyAssetForm.getAssetShow();
       if (StringUtils.isEmpty(imageShow)) {
          imageShow = "thumbnail";


Index: ImageUploadAction.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/ImageUploadAction.java,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.2
diff -u -b -r1.9.2.1 -r1.9.2.2
--- ImageUploadAction.java      17 Mar 2009 07:15:51 -0000      1.9.2.1
+++ ImageUploadAction.java      18 Mar 2009 03:53:37 -0000      1.9.2.2
@@ -19,7 +19,7 @@
 public class ImageUploadAction extends AbstractUploadAction {
 
    private static final String ALL = "all";
-   private static final String SITEIMAGES = "siteimages";
+   private static final String SITEASSETS = "siteassets";
    private static final String CREATION = "creation";
 
    @Override
@@ -35,7 +35,7 @@
       String exceed = "yes";
       int nodeId = 0;
 
-      if (parentchannel.equalsIgnoreCase(SITEIMAGES)) {
+      if (parentchannel.equalsIgnoreCase(SITEASSETS)) {
          parentchannel = RepositoryUtil.getRoot(cloud);
       } else if (parentchannel.equalsIgnoreCase(ALL) || 
StringUtils.isEmpty(parentchannel)) {
          parentchannel = (String) request.getSession().getAttribute(CREATION);
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs