From 560966803aed021d292677b8e5dbf487820a4e5c Mon Sep 17 00:00:00 2001
From: Daniel Haag <daniel.haag@uibk.ac.at>
Date: Fri, 8 Jul 2016 09:22:52 +0200
Subject: [PATCH] OPENOLAT-330: inverted logic for course catalog display in
the course creation dialog
---
.../CreateCourseRepositoryEntryController.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/java/at/ac/uibk/course/CreateCourseRepositoryEntryController.java b/src/main/java/at/ac/uibk/course/CreateCourseRepositoryEntryController.java
index 127b8a5c179..b889dd084bc 100644
--- a/src/main/java/at/ac/uibk/course/CreateCourseRepositoryEntryController.java
+++ b/src/main/java/at/ac/uibk/course/CreateCourseRepositoryEntryController.java
@@ -521,7 +521,7 @@ public class CreateCourseRepositoryEntryController extends FormBasicController
}
radioAccess.setVisible(true);
- catalogDropdownElement.setVisible(false);
+ catalogDropdownElement.setVisible(true);
flc.getComponent().setDirty(true);
} else if (event instanceof EntriesChosenEvent) {
@@ -590,7 +590,7 @@ public class CreateCourseRepositoryEntryController extends FormBasicController
radioSync.setVisible(true);
radioSync.select("form.user.sync.sis", true);
- catalogDropdownElement.setVisible(true);
+ catalogDropdownElement.setVisible(false);
for (Identity tutor : filterAvailableUsers(sc.getTutors())) {
createCourseModel.addAdditionalOwner(tutor);
@@ -599,7 +599,7 @@ public class CreateCourseRepositoryEntryController extends FormBasicController
radioSync.setEnabled(false);
radioSync.setVisible(false);
- catalogDropdownElement.setVisible(false);
+ catalogDropdownElement.setVisible(true);
}
ownerCheckBoxes.setVisible(true);
@@ -799,6 +799,9 @@ public class CreateCourseRepositoryEntryController extends FormBasicController
* external id
*/
if (isCreatedFromSisCourse) {
+ SisManager.getInstance()
+ .sendInvalidateCourseEvent(externalCourseId);
+ } else {
CatalogEntry newParent = catalogManager.loadCatalogEntry(Long.valueOf(catalogDropdownElement.getSelectedKey()));
// Do not create new catalog entries in the root category
if(newParent.getParent() != null) {
@@ -811,9 +814,6 @@ public class CreateCourseRepositoryEntryController extends FormBasicController
// save entry
catalogManager.addCatalogEntry(newParent, newEntry);
}
-
- SisManager.getInstance()
- .sendInvalidateCourseEvent(externalCourseId);
}
ThreadLocalUserActivityLogger.log(
--
GitLab