From 30a1ae54f87980b9435f00cbcb3d0577403e73ce Mon Sep 17 00:00:00 2001
From: aboeckle <alexander.boeckle@frentix.com>
Date: Wed, 15 Jan 2020 07:43:46 +0100
Subject: [PATCH] OO-4375 Removed old entries from menu
---
.../org/olat/_spring/extensionContext.xml | 19 ------------------
.../admin/sysinfo/LargeFilesController.java | 11 +++++-----
.../services/_spring/servicesCorecontext.xml | 20 -------------------
.../vfs/ui/version/VFSTrashController.java | 1 +
4 files changed, 7 insertions(+), 44 deletions(-)
diff --git a/src/main/java/org/olat/_spring/extensionContext.xml b/src/main/java/org/olat/_spring/extensionContext.xml
index 771c8d381d8..ecfaddd8630 100644
--- a/src/main/java/org/olat/_spring/extensionContext.xml
+++ b/src/main/java/org/olat/_spring/extensionContext.xml
@@ -398,25 +398,6 @@
</list>
</property>
</bean>
- <!-- the quota menu-entry -->
- <bean class="org.olat.core.extensions.action.GenericActionExtension" init-method="initExtensionPoints" >
- <property name="order" value="7203" />
- <property name="navigationKey" value="quota" />
- <property name="actionController">
- <bean class="org.olat.core.gui.control.creator.AutoCreator" scope="prototype">
- <property name="className" value="org.olat.admin.quota.QuotaController"/>
- </bean>
- </property>
- <property name="translationPackage" value="org.olat.admin" />
- <property name="i18nActionKey" value="menu.quota"/>
- <property name="i18nDescriptionKey" value="menu.quota.alt"/>
- <property name="parentTreeNodeIdentifier" value="sysconfigParent" />
- <property name="extensionPoints">
- <list>
- <value>org.olat.admin.SystemAdminMainController</value>
- </list>
- </property>
- </bean>
<!-- Security admin. panel -->
<bean class="org.olat.core.extensions.action.GenericActionExtension" init-method="initExtensionPoints">
<property name="order" value="8805" />
diff --git a/src/main/java/org/olat/admin/sysinfo/LargeFilesController.java b/src/main/java/org/olat/admin/sysinfo/LargeFilesController.java
index 03c628e6c23..f4cfdf29128 100644
--- a/src/main/java/org/olat/admin/sysinfo/LargeFilesController.java
+++ b/src/main/java/org/olat/admin/sysinfo/LargeFilesController.java
@@ -319,10 +319,6 @@ public class LargeFilesController extends FormBasicController implements Extende
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(false, LargeFilesTableColumns.fileType));
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(false, LargeFilesTableColumns.downloadCount));
- DefaultFlexiColumnModel sendMail = new DefaultFlexiColumnModel(false, LargeFilesTableColumns.sendMail, "sendMail", new LargeFilesSendMailCellRenderer());
- sendMail.setIconHeader(CSSHelper.getIconCssClassFor(CSSHelper.CSS_CLASS_MAIL));
- columnsModel.addFlexiColumnModel(sendMail);
-
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(false, LargeFilesTableColumns.author, "selectAuthor"));
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(false, LargeFilesTableColumns.license));
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(false, LargeFilesTableColumns.language));
@@ -339,6 +335,11 @@ public class LargeFilesController extends FormBasicController implements Extende
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(false, LargeFilesTableColumns.pubDate));
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(false, LargeFilesTableColumns.createdAt));
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(false, LargeFilesTableColumns.lastModifiedAt));
+
+ DefaultFlexiColumnModel sendMail = new DefaultFlexiColumnModel(true, LargeFilesTableColumns.sendMail, "sendMail", new LargeFilesSendMailCellRenderer());
+ sendMail.setAlwaysVisible(true);
+ sendMail.setIconHeader(CSSHelper.getIconCssClassFor(CSSHelper.CSS_CLASS_MAIL));
+ columnsModel.addFlexiColumnModel(sendMail);
largeFilesTableModel = new LargeFilesTableModel(columnsModel, getLocale());
largeFilesTableElement = uifactory.addTableElement(getWindowControl(), "large_files", largeFilesTableModel, getTranslator(), formLayout);
@@ -490,7 +491,7 @@ public class LargeFilesController extends FormBasicController implements Extende
cmsg.addEmailTo(contactList);
cmsg.setSubject("Too large files in your personal folder");
- String bodyStart = translate("largefiles.mail.start", new String[] {user.getUser().getFirstName() + user.getUser().getLastName()});
+ String bodyStart = translate("largefiles.mail.start", new String[] {user.getUser().getFirstName() + " " + user.getUser().getLastName()});
String bodyFiles = "<ul>";
String bodyEnd = translate("largefiles.mail.end");
diff --git a/src/main/java/org/olat/core/commons/services/_spring/servicesCorecontext.xml b/src/main/java/org/olat/core/commons/services/_spring/servicesCorecontext.xml
index 603257c3149..188b1837000 100644
--- a/src/main/java/org/olat/core/commons/services/_spring/servicesCorecontext.xml
+++ b/src/main/java/org/olat/core/commons/services/_spring/servicesCorecontext.xml
@@ -78,26 +78,6 @@
</property>
</bean>
- <!-- The version configuration -->
- <bean class="org.olat.core.extensions.action.GenericActionExtension" init-method="initExtensionPoints" >
- <property name="order" value="7204" />
- <property name="navigationKey" value="versioning" />
- <property name="actionController">
- <bean class="org.olat.core.gui.control.creator.AutoCreator" scope="prototype">
- <property name="className" value="org.olat.core.commons.services.vfs.ui.version.VersionAdminController"/>
- </bean>
- </property>
- <property name="translationPackage" value="org.olat.admin" />
- <property name="i18nActionKey" value="menu.versions"/>
- <property name="i18nDescriptionKey" value="menu.versions.alt"/>
- <property name="parentTreeNodeIdentifier" value="sysconfigParent" />
- <property name="extensionPoints">
- <list>
- <value>org.olat.admin.SystemAdminMainController</value>
- </list>
- </property>
- </bean>
-
<!-- Pdf service -->
<bean class="org.olat.core.extensions.action.GenericActionExtension" init-method="initExtensionPoints">
<property name="order" value="8280" />
diff --git a/src/main/java/org/olat/core/commons/services/vfs/ui/version/VFSTrashController.java b/src/main/java/org/olat/core/commons/services/vfs/ui/version/VFSTrashController.java
index 740885d1cf4..94077711032 100644
--- a/src/main/java/org/olat/core/commons/services/vfs/ui/version/VFSTrashController.java
+++ b/src/main/java/org/olat/core/commons/services/vfs/ui/version/VFSTrashController.java
@@ -156,6 +156,7 @@ public class VFSTrashController extends FormBasicController implements ProgressD
sortOptions.setDefaultOrderBy(new SortKey(VersionsDeletedCols.size.name(), false));
orphansListTableEl.setSortSettings(sortOptions);
orphansListTableEl.setAndLoadPersistedPreferences(ureq, "deleted-rev-file-list");
+ orphansListTableEl.setSelectAllEnable(true);
orphansDeleteButton = uifactory.addFormLink("delete", tableLayout, Link.BUTTON);
orphansDeleteButton.setIconLeftCSS(CSSHelper.getIconCssClassFor(CSSHelper.CSS_CLASS_TRASHED));
--
GitLab