[MMBASE CVS] contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms 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-serv25274/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms

Modified Files:
        HighFrequencyAssetAction.java ImageUploadAction.java 
Log Message:
CMSC-1279 - Assets: Relate Image 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-1279


Index: HighFrequencyAssetAction.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/HighFrequencyAssetAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- HighFrequencyAssetAction.java       11 Mar 2009 08:36:40 -0000      1.5
+++ HighFrequencyAssetAction.java       17 Mar 2009 06:48:08 -0000      1.6
@@ -57,6 +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 CREATION = "creation";
    private static final String CONTENTELEMENT = "contentelement";
    private static final String SOURCE = "source";
@@ -75,7 +76,7 @@
       HighFrequencyAssetForm highFrequencyAssetForm = (HighFrequencyAssetForm) 
form;
 
       String channelid = highFrequencyAssetForm.getChannelid();
-      boolean existChannelConstraint = StringUtils.isNotEmpty(channelid) && 
!ALL.equals(channelid);
+      boolean existChannelConstraint = StringUtils.isNotEmpty(channelid) && 
!ALL.equals(channelid) && !SITEIMAGES.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
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- ImageUploadAction.java      19 Feb 2009 08:26:14 -0000      1.9
+++ ImageUploadAction.java      17 Mar 2009 06:48:08 -0000      1.10
@@ -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 ImageUploadAction extends AbstractUploadAction {
 
    private static final String ALL = "all";
+   private static final String SITEIMAGES = "siteimages";
    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(SITEIMAGES)) {
+         parentchannel = RepositoryUtil.getRoot(cloud);
+      } else if (parentchannel.equalsIgnoreCase(ALL) || 
StringUtils.isEmpty(parentchannel)) {
          parentchannel = (String) request.getSession().getAttribute(CREATION);
       }
       if (isImage(file.getFileName())) {
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs