From ddcf9cb694cf7c240c269a363b5c9b8d207f4115 Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Tue, 2 Sep 2014 10:09:16 +0200
Subject: [PATCH] OO-981: if the catalog is disabled, remove the tool "add to
catalog" in course toolbar and remove the little message in publish workflow
---
src/main/java/org/olat/course/editor/PublishStep01.java | 4 +++-
.../olat/course/editor/_content/publish_courseaccess.html | 2 ++
.../java/org/olat/course/run/CourseRuntimeController.java | 1 +
.../repository/ui/RepositoryEntryRuntimeController.java | 6 +++++-
4 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/olat/course/editor/PublishStep01.java b/src/main/java/org/olat/course/editor/PublishStep01.java
index 14c51d2c662..da7943c0e03 100644
--- a/src/main/java/org/olat/course/editor/PublishStep01.java
+++ b/src/main/java/org/olat/course/editor/PublishStep01.java
@@ -131,8 +131,10 @@ class PublishStep01 extends BasicStep {
protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
Translator pt = Util.createPackageTranslator(RepositoryService.class, getLocale(), getTranslator());
- FormItemContainer fic = FormLayoutContainer.createCustomFormLayout("access", pt, velocity_root + "/publish_courseaccess.html");
+ FormLayoutContainer fic = FormLayoutContainer.createCustomFormLayout("access", pt, velocity_root + "/publish_courseaccess.html");
formLayout.add(fic);
+ RepositoryModule repositoryModule = CoreSpringFactory.getImpl(RepositoryModule.class);
+ fic.contextPut("catalogEnabled", repositoryModule.isCatalogEnabled());
List<String> keyList = new ArrayList<String>();
keyList.add(Integer.toString(RepositoryEntry.ACC_OWNERS));
diff --git a/src/main/java/org/olat/course/editor/_content/publish_courseaccess.html b/src/main/java/org/olat/course/editor/_content/publish_courseaccess.html
index 5bea61ec9a2..f6e4cbead84 100644
--- a/src/main/java/org/olat/course/editor/_content/publish_courseaccess.html
+++ b/src/main/java/org/olat/course/editor/_content/publish_courseaccess.html
@@ -2,7 +2,9 @@
<div class='o_important'>
$r.translate("pbl.access.warning")
</div>
+#if($catalogEnabled)
<div class='o_info'>
$r.translate("pbl.remind.catalog")
</div>
+#end
$r.render("accessBox")
\ No newline at end of file
diff --git a/src/main/java/org/olat/course/run/CourseRuntimeController.java b/src/main/java/org/olat/course/run/CourseRuntimeController.java
index ae005121eb5..384dc0ac09f 100644
--- a/src/main/java/org/olat/course/run/CourseRuntimeController.java
+++ b/src/main/java/org/olat/course/run/CourseRuntimeController.java
@@ -435,6 +435,7 @@ public class CourseRuntimeController extends RepositoryEntryRuntimeController im
catalogLink = LinkFactory.createToolLink("access.cmd", translate("command.catalog"), this, "o_icon_catalog");
catalogLink.setElementCssClass("o_sel_course_catalog");
+ catalogLink.setVisible(repositoryModule.isCatalogEnabled());
settings.addComponent(catalogLink);
settings.addComponent(new Spacer(""));
diff --git a/src/main/java/org/olat/repository/ui/RepositoryEntryRuntimeController.java b/src/main/java/org/olat/repository/ui/RepositoryEntryRuntimeController.java
index def5f6d5ed1..b4ec794348c 100644
--- a/src/main/java/org/olat/repository/ui/RepositoryEntryRuntimeController.java
+++ b/src/main/java/org/olat/repository/ui/RepositoryEntryRuntimeController.java
@@ -56,6 +56,7 @@ import org.olat.core.util.resource.OresHelper;
import org.olat.repository.RepositoryEntry;
import org.olat.repository.RepositoryEntryManagedFlag;
import org.olat.repository.RepositoryManager;
+import org.olat.repository.RepositoryModule;
import org.olat.repository.RepositoryService;
import org.olat.repository.handlers.EditionSupport;
import org.olat.repository.handlers.RepositoryHandler;
@@ -122,10 +123,12 @@ public class RepositoryEntryRuntimeController extends MainLayoutBasicController
@Autowired
protected MarkManager markManager;
@Autowired
- protected RepositoryManager repositoryManager;
+ protected RepositoryModule repositoryModule;
@Autowired
private RepositoryService repositoryService;
@Autowired
+ protected RepositoryManager repositoryManager;
+ @Autowired
private RepositoryHandlerFactory handlerFactory;
public RepositoryEntryRuntimeController(UserRequest ureq, WindowControl wControl, RepositoryEntry re,
@@ -251,6 +254,7 @@ public class RepositoryEntryRuntimeController extends MainLayoutBasicController
catalogLink = LinkFactory.createToolLink("cat", translate("details.categoriesheader"), this, "o_icon_catalog");
catalogLink.setElementCssClass("o_sel_repo_add_to_catalog");
+ catalogLink.setVisible(repositoryModule.isCatalogEnabled());
settingsDropdown.addComponent(catalogLink);
}
--
GitLab