Skip to content
Snippets Groups Projects
Commit 56096680 authored by User expired's avatar User expired
Browse files

OPENOLAT-330: inverted logic for course catalog display in the course creation dialog

parent 534590d2
No related branches found
No related tags found
No related merge requests found
...@@ -521,7 +521,7 @@ public class CreateCourseRepositoryEntryController extends FormBasicController ...@@ -521,7 +521,7 @@ public class CreateCourseRepositoryEntryController extends FormBasicController
} }
radioAccess.setVisible(true); radioAccess.setVisible(true);
catalogDropdownElement.setVisible(false); catalogDropdownElement.setVisible(true);
flc.getComponent().setDirty(true); flc.getComponent().setDirty(true);
} else if (event instanceof EntriesChosenEvent) { } else if (event instanceof EntriesChosenEvent) {
...@@ -590,7 +590,7 @@ public class CreateCourseRepositoryEntryController extends FormBasicController ...@@ -590,7 +590,7 @@ public class CreateCourseRepositoryEntryController extends FormBasicController
radioSync.setVisible(true); radioSync.setVisible(true);
radioSync.select("form.user.sync.sis", true); radioSync.select("form.user.sync.sis", true);
catalogDropdownElement.setVisible(true); catalogDropdownElement.setVisible(false);
for (Identity tutor : filterAvailableUsers(sc.getTutors())) { for (Identity tutor : filterAvailableUsers(sc.getTutors())) {
createCourseModel.addAdditionalOwner(tutor); createCourseModel.addAdditionalOwner(tutor);
...@@ -599,7 +599,7 @@ public class CreateCourseRepositoryEntryController extends FormBasicController ...@@ -599,7 +599,7 @@ public class CreateCourseRepositoryEntryController extends FormBasicController
radioSync.setEnabled(false); radioSync.setEnabled(false);
radioSync.setVisible(false); radioSync.setVisible(false);
catalogDropdownElement.setVisible(false); catalogDropdownElement.setVisible(true);
} }
ownerCheckBoxes.setVisible(true); ownerCheckBoxes.setVisible(true);
...@@ -799,6 +799,9 @@ public class CreateCourseRepositoryEntryController extends FormBasicController ...@@ -799,6 +799,9 @@ public class CreateCourseRepositoryEntryController extends FormBasicController
* external id * external id
*/ */
if (isCreatedFromSisCourse) { if (isCreatedFromSisCourse) {
SisManager.getInstance()
.sendInvalidateCourseEvent(externalCourseId);
} else {
CatalogEntry newParent = catalogManager.loadCatalogEntry(Long.valueOf(catalogDropdownElement.getSelectedKey())); CatalogEntry newParent = catalogManager.loadCatalogEntry(Long.valueOf(catalogDropdownElement.getSelectedKey()));
// Do not create new catalog entries in the root category // Do not create new catalog entries in the root category
if(newParent.getParent() != null) { if(newParent.getParent() != null) {
...@@ -811,9 +814,6 @@ public class CreateCourseRepositoryEntryController extends FormBasicController ...@@ -811,9 +814,6 @@ public class CreateCourseRepositoryEntryController extends FormBasicController
// save entry // save entry
catalogManager.addCatalogEntry(newParent, newEntry); catalogManager.addCatalogEntry(newParent, newEntry);
} }
SisManager.getInstance()
.sendInvalidateCourseEvent(externalCourseId);
} }
ThreadLocalUserActivityLogger.log( ThreadLocalUserActivityLogger.log(
......
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