Skip to content
Snippets Groups Projects
Commit 13bf1879 authored by srosse's avatar srosse
Browse files

OO-1350: administrators of a catalog entry can manage the entry itself and not only the sub-entries

parent 6ce3e00e
No related branches found
No related tags found
No related merge requests found
...@@ -322,7 +322,7 @@ public class CatalogNodeManagerController extends FormBasicController implements ...@@ -322,7 +322,7 @@ public class CatalogNodeManagerController extends FormBasicController implements
protected void initToolbar() { protected void initToolbar() {
boolean canAddLinks = isOLATAdmin || isAuthor; // author is allowed to add! boolean canAddLinks = isOLATAdmin || isAuthor; // author is allowed to add!
boolean canAdministrateCategory = isOLATAdmin; boolean canAdministrateCategory = isOLATAdmin || isLocalTreeAdmin;
boolean canAddSubCategories = isOLATAdmin || isLocalTreeAdmin; boolean canAddSubCategories = isOLATAdmin || isLocalTreeAdmin;
if (canAdministrateCategory || canAddLinks) { if (canAdministrateCategory || canAddLinks) {
...@@ -385,8 +385,8 @@ public class CatalogNodeManagerController extends FormBasicController implements ...@@ -385,8 +385,8 @@ public class CatalogNodeManagerController extends FormBasicController implements
//the "Node" is only for internal usage //the "Node" is only for internal usage
StateEntry stateEntry = entry.getTransientState(); StateEntry stateEntry = entry.getTransientState();
if(stateEntry instanceof CatalogStateEntry) { if(stateEntry instanceof CatalogStateEntry) {
CatalogEntry catalogEntry = ((CatalogStateEntry)stateEntry).getEntry(); CatalogEntry catEntry = ((CatalogStateEntry)stateEntry).getEntry();
CatalogNodeManagerController nextCtrl = selectCatalogEntry(ureq, catalogEntry); CatalogNodeManagerController nextCtrl = selectCatalogEntry(ureq, catEntry);
if(nextCtrl != null && entries.size() > 1) { if(nextCtrl != null && entries.size() > 1) {
nextCtrl.activate(ureq, entries.subList(1, entries.size()), null); nextCtrl.activate(ureq, entries.subList(1, entries.size()), null);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment