From e473e277bdd1697a5a41a8089925d27dceb82be3 Mon Sep 17 00:00:00 2001
From: uhensler <none@none>
Date: Tue, 13 Jun 2017 09:48:58 +0200
Subject: [PATCH] OO-2723: the title of the blog should be shown if the blog
was created inside a course node
---
.../org/olat/modules/webFeed/manager/FeedManagerImpl.java | 7 +++----
.../org/olat/modules/webFeed/ui/FeedMainController.java | 2 ++
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/olat/modules/webFeed/manager/FeedManagerImpl.java b/src/main/java/org/olat/modules/webFeed/manager/FeedManagerImpl.java
index e4dea97f92d..36e442ac1c9 100644
--- a/src/main/java/org/olat/modules/webFeed/manager/FeedManagerImpl.java
+++ b/src/main/java/org/olat/modules/webFeed/manager/FeedManagerImpl.java
@@ -573,10 +573,9 @@ public class FeedManagerImpl extends FeedManager {
RepositoryEntry entry = repositoryManager.lookupRepositoryEntry(feed, false);
if (entry != null && feed != null) {
Date whenTheFeedWasLastModified = feed.getLastModified();
- if (whenTheFeedWasLastModified == null || entry.getLastModified().after(whenTheFeedWasLastModified)) {
+ if (feed.getTitle() == null || whenTheFeedWasLastModified == null || entry.getLastModified().after(whenTheFeedWasLastModified)) {
// Copy the title (only) initially
- String feedTitle = feed.getTitle();
- if (feedTitle == null) {
+ if (feed.getTitle() == null) {
feed.setTitle(entry.getDisplayname());
}
if (StringHelper.containsNonWhitespace(entry.getAuthors())) {
@@ -712,7 +711,7 @@ public class FeedManagerImpl extends FeedManager {
SyndFeed feed = input.build(new XmlReader(realUrl));
if (!feed.getEntries().isEmpty()) {
// check for enclosures
- SyndEntry entry = (SyndEntry) feed.getEntries().get(0);
+ SyndEntry entry = feed.getEntries().get(0);
if (type != null && type.indexOf("BLOG") >= 0) {
return new ValidatedURL(url, ValidatedURL.State.VALID);
}
diff --git a/src/main/java/org/olat/modules/webFeed/ui/FeedMainController.java b/src/main/java/org/olat/modules/webFeed/ui/FeedMainController.java
index bba69ab9045..23c3dc5eff2 100644
--- a/src/main/java/org/olat/modules/webFeed/ui/FeedMainController.java
+++ b/src/main/java/org/olat/modules/webFeed/ui/FeedMainController.java
@@ -222,6 +222,7 @@ public class FeedMainController extends BasicController implements Activateable2
* @see org.olat.core.gui.control.DefaultController#event(org.olat.core.gui.UserRequest,
* org.olat.core.gui.control.Controller, org.olat.core.gui.control.Event)
*/
+ @Override
protected void event(UserRequest ureq, Controller source, Event event) {
if (source == cmc) {
if (event.equals(CloseableModalController.CLOSE_MODAL_EVENT)) {
@@ -336,6 +337,7 @@ public class FeedMainController extends BasicController implements Activateable2
/**
* @see org.olat.core.util.event.GenericEventListener#event(org.olat.core.gui.control.Event)
*/
+ @Override
public void event(Event event) {
if (event instanceof OLATResourceableJustBeforeDeletedEvent) {
OLATResourceableJustBeforeDeletedEvent ojde = (OLATResourceableJustBeforeDeletedEvent) event;
--
GitLab