From 13bf187911aa5f092f9c5f0b2e546dc358f81a7e Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Thu, 11 Dec 2014 15:49:22 +0100
Subject: [PATCH] OO-1350: administrators of a catalog entry can manage the
entry itself and not only the sub-entries
---
.../repository/ui/catalog/CatalogNodeManagerController.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/olat/repository/ui/catalog/CatalogNodeManagerController.java b/src/main/java/org/olat/repository/ui/catalog/CatalogNodeManagerController.java
index 90877e6da05..54faee77310 100644
--- a/src/main/java/org/olat/repository/ui/catalog/CatalogNodeManagerController.java
+++ b/src/main/java/org/olat/repository/ui/catalog/CatalogNodeManagerController.java
@@ -322,7 +322,7 @@ public class CatalogNodeManagerController extends FormBasicController implements
protected void initToolbar() {
boolean canAddLinks = isOLATAdmin || isAuthor; // author is allowed to add!
- boolean canAdministrateCategory = isOLATAdmin;
+ boolean canAdministrateCategory = isOLATAdmin || isLocalTreeAdmin;
boolean canAddSubCategories = isOLATAdmin || isLocalTreeAdmin;
if (canAdministrateCategory || canAddLinks) {
@@ -385,8 +385,8 @@ public class CatalogNodeManagerController extends FormBasicController implements
//the "Node" is only for internal usage
StateEntry stateEntry = entry.getTransientState();
if(stateEntry instanceof CatalogStateEntry) {
- CatalogEntry catalogEntry = ((CatalogStateEntry)stateEntry).getEntry();
- CatalogNodeManagerController nextCtrl = selectCatalogEntry(ureq, catalogEntry);
+ CatalogEntry catEntry = ((CatalogStateEntry)stateEntry).getEntry();
+ CatalogNodeManagerController nextCtrl = selectCatalogEntry(ureq, catEntry);
if(nextCtrl != null && entries.size() > 1) {
nextCtrl.activate(ureq, entries.subList(1, entries.size()), null);
}
--
GitLab