From 4ea055d22fa7bcf6aab397ad3bccc4b87de75f34 Mon Sep 17 00:00:00 2001
From: aboeckle <alexander.boeckle@frentix.com>
Date: Fri, 30 Jul 2021 09:12:21 +0200
Subject: [PATCH] OO-5614: Remove list of shared items
---
.../olat/modules/portfolio/ui/PageMetadataController.java | 7 ++++++-
.../org/olat/modules/portfolio/ui/_content/page_meta.html | 4 ++--
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/olat/modules/portfolio/ui/PageMetadataController.java b/src/main/java/org/olat/modules/portfolio/ui/PageMetadataController.java
index 87e8801ebd7..5cfd7c00fa9 100644
--- a/src/main/java/org/olat/modules/portfolio/ui/PageMetadataController.java
+++ b/src/main/java/org/olat/modules/portfolio/ui/PageMetadataController.java
@@ -189,10 +189,14 @@ public class PageMetadataController extends BasicController {
private void initMetadata(UserRequest ureq) {
Set<Identity> owners = new HashSet<>();
+ boolean isOwnedByViewer;
+
if(page.getSection() != null && page.getSection().getBinder() != null) {
owners.addAll(portfolioService.getMembers(page.getSection().getBinder(), PortfolioRoles.owner.name()));
}
+
owners.addAll(portfolioService.getMembers(page, PortfolioRoles.owner.name()));
+ isOwnedByViewer = owners.contains(ureq.getUserSession().getIdentity());
StringBuilder ownerSb = new StringBuilder();
for(Identity owner:owners) {
@@ -206,7 +210,8 @@ public class PageMetadataController extends BasicController {
mainVC.contextPut("statusIconCss", page.getPageStatus() == null ? PageStatus.draft.iconClass() : page.getPageStatus().iconClass());
mainVC.contextPut("statusCssClass", page.getPageStatus() == null ? PageStatus.draft.statusClass() : page.getPageStatus().statusClass());
- int sharedWith = portfolioService.countSharedPageBody(page) - 1;
+
+ int sharedWith = isOwnedByViewer ? portfolioService.countSharedPageBody(page) - 1 : -1;
if(sharedWith > 0) {
String sharedWithString = String.valueOf(sharedWith) + " " + translate("page.body.shared.with." + (sharedWith == 1 ? "entry" : "entries"));
sharedWithLink = LinkFactory.createLink("sharedWithLink", "sharedWithLink", "showSharedPages", sharedWithString, getTranslator(), mainVC, this, Link.NONTRANSLATED);
diff --git a/src/main/java/org/olat/modules/portfolio/ui/_content/page_meta.html b/src/main/java/org/olat/modules/portfolio/ui/_content/page_meta.html
index 37574f30386..e4c3870e03f 100644
--- a/src/main/java/org/olat/modules/portfolio/ui/_content/page_meta.html
+++ b/src/main/java/org/olat/modules/portfolio/ui/_content/page_meta.html
@@ -35,7 +35,7 @@
#else
<i class="o_icon o_icon_fw o_icon_tags" title="$r.translateInAttribute("categories")"> </i>
#foreach($category in $pageCategories)
- <span class="tag label label-info">
+ <span class="o_tag">
$category
</span>
#end
@@ -50,7 +50,7 @@
#else
<i class="o_icon o_icon_fw o_icon_competences" title="$r.translateInAttribute("competences")"> </i>
#foreach($competence in $pageCompetences)
- <span class="tag label label-info">
+ <span class="o_tag o_competence">
$competence
</span>
#end
--
GitLab