From c577cc633aff066391199c1f5ab51a936ac25420 Mon Sep 17 00:00:00 2001
From: srosse <stephane.rosse@frentix.com>
Date: Wed, 4 Sep 2019 19:01:35 +0200
Subject: [PATCH] OO-4221: take the last parent in account to build the
hierarchy
---
.../model/CurriculumElementRepositoryEntryViews.java | 4 ++--
.../lecture/ui/ParticipantLecturesOverviewController.java | 2 +-
.../lecture/ui/_content/participant_overview_table.html | 4 ----
3 files changed, 3 insertions(+), 7 deletions(-)
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 58026e987cc..c5e509cb9b0 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 a8ff169cadb..b48b7452827 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 ed539254384..e0fafcbf696 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
--
GitLab