diff --git a/src/main/java/org/olat/modules/curriculum/model/CurriculumElementRepositoryEntryViews.java b/src/main/java/org/olat/modules/curriculum/model/CurriculumElementRepositoryEntryViews.java index 58026e987cce7a24d70dc4ba5415d0fcf7dde120..c5e509cb9b02e097472c6a84b21832ea1b48b9ed 100644 --- a/src/main/java/org/olat/modules/curriculum/model/CurriculumElementRepositoryEntryViews.java +++ b/src/main/java/org/olat/modules/curriculum/model/CurriculumElementRepositoryEntryViews.java @@ -98,7 +98,7 @@ public class CurriculumElementRepositoryEntryViews implements CurriculumElementW @Override public int hashCode() { - return curriculumElement.hashCode(); + return curriculumElement.getKey().hashCode(); } @Override @@ -108,7 +108,7 @@ public class CurriculumElementRepositoryEntryViews implements CurriculumElementW } if(obj instanceof CurriculumElementRepositoryEntryViews) { CurriculumElementRepositoryEntryViews el = (CurriculumElementRepositoryEntryViews)obj; - return curriculumElement.equals(el.curriculumElement); + return curriculumElement.getKey().equals(el.curriculumElement.getKey()); } return super.equals(obj); } diff --git a/src/main/java/org/olat/modules/lecture/ui/ParticipantLecturesOverviewController.java b/src/main/java/org/olat/modules/lecture/ui/ParticipantLecturesOverviewController.java index a8ff169cadbdf881354882420523671784bc1c64..b48b74528276d062c23fbfe09de0ea1f79afa1cd 100644 --- a/src/main/java/org/olat/modules/lecture/ui/ParticipantLecturesOverviewController.java +++ b/src/main/java/org/olat/modules/lecture/ui/ParticipantLecturesOverviewController.java @@ -300,7 +300,7 @@ public class ParticipantLecturesOverviewController extends FormBasicController i } for(CurriculumElementRepositoryEntryViews view:elementsWithViews) { - for(CurriculumElementRepositoryEntryViews parent=view; parent.getParent() != null; parent=parent.getParent()) { + for(CurriculumElementRepositoryEntryViews parent=view; parent != null; parent=parent.getParent()) { if(references.contains(parent)) { results.get(parent).addDescendant(view); } diff --git a/src/main/java/org/olat/modules/lecture/ui/_content/participant_overview_table.html b/src/main/java/org/olat/modules/lecture/ui/_content/participant_overview_table.html index ed539254384d96f17580c4aff6c9e2a19448dcd0..e0fafcbf69647d1711934010347408ae967a7b65 100644 --- a/src/main/java/org/olat/modules/lecture/ui/_content/participant_overview_table.html +++ b/src/main/java/org/olat/modules/lecture/ui/_content/participant_overview_table.html @@ -6,17 +6,13 @@ #end <div id="collapse_${r.getCId()}" class="collapse #if($opened) in #end">$r.render("table")</div> <script> -/* <![CDATA[ */ jQuery(function() { jQuery('#collapse_${r.getCId()}').on('hide.bs.collapse', function () { - console.log('hide'); jQuery('#collapse_${r.getCId()}_toggler').removeClass('o_icon_close_togglebox').addClass('o_icon_open_togglebox'); }) jQuery('#collapse_${r.getCId()}').on('show.bs.collapse', function () { - console.log('show'); jQuery('#collapse_${r.getCId()}_toggler').removeClass('o_icon_open_togglebox').addClass('o_icon_close_togglebox'); }) }); -/* ]]> */ </script> #end \ No newline at end of file