OO-2723: Show the images in the blog/podcast description again

src/main/java/org/olat/modules/webFeed/manager/FeedFileStorge.java

@@ -486,10 +486,10 @@ public class FeedFileStorge {
 	}
 	
 	/**
-	 * Save the the media (video/audio) of the item. If allready a file is in
-	 * the media container, that file is previously deleted.
-	 * If the media is null, this method will do nothing. It does not delete
-	 * the existing media.
+	 * Save a file (video/audio/image) to the media container of the item.
+	 * <p>
+	 * If the media is null, this method will do nothing. It does not delete the
+	 * existing media files.
 	 * 
 	 * @param item
 	 * @param media
@@ -501,7 +501,6 @@ public class FeedFileStorge {
 		if (media != null) {
 			VFSContainer itemMediaContainer = getOrCreateItemMediaContainer(item);
 			if (itemMediaContainer != null) {
-				deleteItemMedia(item);
 				VFSItem movedItem = media.moveUploadFileTo(itemMediaContainer);
 				saveFileName = Formatter.makeStringFilesystemSave(media.getUploadFileName());
 				movedItem.rename(saveFileName);
@@ -533,16 +532,18 @@ public class FeedFileStorge {
 	}
 	
 	/**
-	 * Delete the the media (video/audio) of the item.
+	 * Delete a file from the media container of an item.
 	 * 
 	 * @param item
+	 * @param fileName
 	 */
-	public void deleteItemMedia(Item item) {
-		VFSContainer itemMediaContainer = getOrCreateItemMediaContainer(item);
-		if (itemMediaContainer != null) {
-			for (VFSItem fileItem : itemMediaContainer.getItems()) {
-				if (!fileItem.getName().startsWith(".")) {
-					fileItem.delete();
+	public void deleteItemMedia(Item item, String fileName) {
+		if (fileName != null) {
+			VFSContainer itemContainer = getOrCreateItemMediaContainer(item);
+			if (itemContainer != null) {
+				VFSLeaf leaf = (VFSLeaf) itemContainer.resolve(fileName);
+				if (leaf != null) {
+					leaf.delete();
 				}
 			}
 		}

src/main/java/org/olat/modules/webFeed/manager/FeedManagerImpl.java

@@ -426,6 +426,9 @@ public class FeedManagerImpl extends FeedManager {
 		
 		if (file != null) {
 			if (file.isUploadSuccess()) {
+				if (enclosure != null && enclosure.getFileName() != null) {
+					feedFileStorage.deleteItemMedia(item, enclosure.getFileName());
+				}
 				// New uploaded file
 				enclosure = new EnclosureImpl();
 				enclosure.setLength(file.getUploadSize());
@@ -433,8 +436,10 @@ public class FeedManagerImpl extends FeedManager {
 				String saveFileName = feedFileStorage.saveItemMedia(item, file);
 				enclosure.setFileName(saveFileName);
 			} else if (file.getInitialFile() == null) {
-				// If no or delete initial file, delete the media file
-				feedFileStorage.deleteItemMedia(item);
+				// If no or deleted initial file, delete the media file
+				if (enclosure != null && enclosure.getFileName() != null) {
+					feedFileStorage.deleteItemMedia(item, enclosure.getFileName());
+				}
 				enclosure = null;
 			}
 		}

src/main/java/org/olat/modules/webFeed/ui/blog/_content/post.html

@@ -30,9 +30,8 @@
 			$!helper.getItemDescriptionForBrowser($item)
 			#set($podId = $r.getUniqueId())
 			#if ($!item.getEnclosure())								
-			<div class="o_block_large_top">
+			<div class="o_block_large_top o_enclosure">
 				<div id="o_podcast_${podId}_episode" class="o_podcast_$!helper.getMediaType($item.getEnclosure())"></div>
-	
 				<script type="text/javascript">
 				/* <![CDATA[ */
 				#if ($!helper.getMediaType($item.getEnclosure()) == "video")

src/main/java/org/olat/modules/webFeed/ui/podcast/_content/episode.html

@@ -37,7 +37,7 @@
 			#end
 
 			#if ($!item.getEnclosure())								
-			<div class="o_block_large_top">
+			<div class="o_block_large_top o_enclosure">
 				<div id="o_podcast_episode_$velocityCount" name="o_podcast_episode_$velocityCount" class="o_podcast_$!helper.getMediaType($item.getEnclosure())" >
 					<a href="http://www.macromedia.com/go/getflashplayer">Get the Flash Player</a> to see this media file.
 				</div>

src/main/java/org/olat/modules/webFeed/ui/podcast/_content/episodes.html

@@ -62,7 +62,7 @@
 				 
 				#set($podId = $r.getUniqueId())
 				#if ($!episode.getEnclosure())								
-				<div class="o_block_large_top">
+				<div class="o_block_large_top o_enclosure">
 					<div id="o_podcast_${podId}_episode" class="o_podcast_$!helper.getMediaType($episode.getEnclosure())"></div>
 					
 					<div class="o_block_top">

src/main/webapp/static/themes/light/modules/_various_modules.scss

@@ -414,6 +414,9 @@ ul.o_certificates li {
 	.o_content {
 		@include clearfix();
 	}
+	.o_enclosure {
+		clear: both;
+	}
 }
 
 /* Glossary */