inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V3.1 to HEAD

Browse Source 
13323: *RECORD-ONLY* Enterprise branding (ETHREEOH-1352 - Community logo in Enterprise version) - DO NOT MERGE
   13325: ETHREEOH-102/ETHREEOH-981 - Thumbnail service doesn't support animated GIFs and no placeholder returned
   13329: ETHREEOH-1417 - Clicking "Create Link" button in Site Links dashlet opens user's dashboard in IE7
   13340: Fix for TinyMCE image-library button image not appearing in all browsers
   13379: Wiki dashlet - added link to configured wiki page

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13597 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mike Hatfield
2009-03-12 12:10:47 +00:00
parent 84b2a4a8b2
commit b810ee7025
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/java/org/alfresco/repo/content/transform/magick/ImageMagickContentTransformer.java
View File

@@ -166,7 +166,7 @@ public class ImageMagickContentTransformer extends AbstractImageMagickContentTra
} }
properties.put(KEY_OPTIONS, commandOptions); properties.put(KEY_OPTIONS, commandOptions);
} }
properties.put(VAR_SOURCE, sourceFile.getAbsolutePath()); properties.put(VAR_SOURCE, sourceFile.getAbsolutePath() + "[0]");
properties.put(VAR_TARGET, targetFile.getAbsolutePath()); properties.put(VAR_TARGET, targetFile.getAbsolutePath());
// execute the statement // execute the statement

12
source/java/org/alfresco/repo/thumbnail/ThumbnailServiceImpl.java
View File

@@ -156,10 +156,10 @@ public class ThumbnailServiceImpl implements ThumbnailService
{ {
if (logger.isDebugEnabled() == true) if (logger.isDebugEnabled() == true)
{ {
logger.debug("Creating thumbnail: There is already a thumbnail with the name '" + thumbnail + "' (node=" + node.toString() + "; contentProperty=" + contentProperty.toString() + "; mimetype=" + mimetype); logger.debug("Creating thumbnail: There is already a thumbnail with the name '" + thumbnailName + "' (node=" + node.toString() + "; contentProperty=" + contentProperty.toString() + "; mimetype=" + mimetype);
} }
// We can't continue because there is already an thumnail with the given name for that content property // We can't continue because there is already an thumbnail with the given name for that content property
throw new ThumbnailException(ERR_DUPLICATE_NAME); throw new ThumbnailException(ERR_DUPLICATE_NAME);
} }
@@ -233,7 +233,7 @@ public class ThumbnailServiceImpl implements ThumbnailService
} }
else else
{ {
// Do the thumnail transformation // Do the thumbnail transformation
this.contentService.transform(reader, writer, transformationOptions); this.contentService.transform(reader, writer, transformationOptions);
} }
@@ -309,7 +309,7 @@ public class ThumbnailServiceImpl implements ThumbnailService
} }
else else
{ {
// Do the thumnail transformation // Do the thumbnail transformation
this.contentService.transform(reader, writer, transformationOptions); this.contentService.transform(reader, writer, transformationOptions);
} }
} }
@@ -344,7 +344,7 @@ public class ThumbnailServiceImpl implements ThumbnailService
// Check that the node has the thumbnailed aspect applied // Check that the node has the thumbnailed aspect applied
if (nodeService.hasAspect(node, ContentModel.ASPECT_THUMBNAILED) == true) if (nodeService.hasAspect(node, ContentModel.ASPECT_THUMBNAILED) == true)
{ {
// Get all the thumnails that match the thumbnail name // Get all the thumbnails that match the thumbnail name
List<ChildAssociationRef> assocs = this.nodeService.getChildAssocs(node, ContentModel.ASSOC_THUMBNAILS, QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, thumbnailName)); List<ChildAssociationRef> assocs = this.nodeService.getChildAssocs(node, ContentModel.ASSOC_THUMBNAILS, QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, thumbnailName));
for (ChildAssociationRef assoc : assocs) for (ChildAssociationRef assoc : assocs)
{ {
@@ -384,7 +384,7 @@ public class ThumbnailServiceImpl implements ThumbnailService
// Check that the node has the thumbnailed aspect applied // Check that the node has the thumbnailed aspect applied
if (nodeService.hasAspect(node, ContentModel.ASPECT_THUMBNAILED) == true) if (nodeService.hasAspect(node, ContentModel.ASPECT_THUMBNAILED) == true)
{ {
// Get all the thumnails that match the thumbnail name // Get all the thumbnails that match the thumbnail name
List<ChildAssociationRef> assocs = this.nodeService.getChildAssocs(node, ContentModel.ASSOC_THUMBNAILS, RegexQNamePattern.MATCH_ALL); List<ChildAssociationRef> assocs = this.nodeService.getChildAssocs(node, ContentModel.ASSOC_THUMBNAILS, RegexQNamePattern.MATCH_ALL);
for (ChildAssociationRef assoc : assocs) for (ChildAssociationRef assoc : assocs)
{ {