diff --git a/src/main/java/org/olat/repository/ui/list/RepositoryEntryDetailsController.java b/src/main/java/org/olat/repository/ui/list/RepositoryEntryDetailsController.java index f7b4c1b5082511aca29c1746db2003344a4c2bcb..e70792342d394a27e2cbabfefaca10c66c093a2e 100644 --- a/src/main/java/org/olat/repository/ui/list/RepositoryEntryDetailsController.java +++ b/src/main/java/org/olat/repository/ui/list/RepositoryEntryDetailsController.java @@ -280,7 +280,7 @@ public class RepositoryEntryDetailsController extends FormBasicController { || roles.contains(GroupRoles.coach.name()) || roles.contains(GroupRoles.participant.name()); if (isMember) { - Boolean isAuthor = Boolean.valueOf(roles.contains(GroupRoles.owner)); + Boolean isAuthor = Boolean.valueOf(roles.contains(GroupRoles.owner.name())); layoutCont.contextPut("isEntryAuthor", isAuthor); } // push roles to velocity as well diff --git a/src/main/java/org/olat/repository/ui/list/_content/details.html b/src/main/java/org/olat/repository/ui/list/_content/details.html index ebde6f5e135a275b5b08427fad4c9b228f6efe94..09913736a47937fd8402484999473c07fc81fc8f 100644 --- a/src/main/java/org/olat/repository/ui/list/_content/details.html +++ b/src/main/java/org/olat/repository/ui/list/_content/details.html @@ -193,7 +193,7 @@ <tr><th>$r.translate("orderby.creationDate")</th><td>$r.formatDateAndTime($v.getCreationDate())</td></tr> <tr><th>$r.translate("orderby.lastModified")</th><td>$r.formatDateAndTime($v.getLastModified())</td></tr> - #if ($isAuthor || $roles.isOLATAdmin() || $roles.isAuthor() || $roles.isInstitutionalResourceManager()) + #if ($isEntryAuthor || $roles.isOLATAdmin() || $roles.isAuthor() || $roles.isInstitutionalResourceManager()) <tr><th>$r.translate("cif.access")</th><td>$accessI18n</td></tr> <tr><th>$r.translate("cif.initialAuthor")</th><td>$v.getInitialAuthor()</td></tr> <tr> @@ -204,6 +204,7 @@ #end </ul></td> </tr> + #end </tbody></table> <div class="panel-body"> <h5>$r.translate("details.extlinkheader")</h5> @@ -235,6 +236,7 @@ </div> </div> + #if ($referenceDetails && ($isEntryAuthor || $roles.isOLATAdmin() || $roles.isInstitutionalResourceManager())) <div class="panel panel-default"> <div class="panel-heading" data-toggle="collapse" data-target="#collapseUsage"> <h3 class="panel-title"> @@ -242,24 +244,20 @@ $r.translate("details.referenceinfoheader") </h3> </div> - <div id="collapseUsage" class="panel-collapse collapse"> + <div id="collapseUsage" class="panel-collapse collapse in"> <table class="table table-condensed table-striped"><tbody> - #if ($referenceDetails) <tr> <th>$r.translate("details.referenceinfo")</th> <td>$referenceDetails</td> </tr> - #end - #if ($isAuthor || $roles.isOLATAdmin() || $roles.isInstitutionalResourceManager()) - <tr><th>$r.translate("cif.lastusage")</th><td>$r.formatDateAndTime($v.getStatistics().getLastUsage())</td></tr> - <tr><th>$r.translate("cif.usedbycnt")</th><td>$numUsers</td></tr> - <tr><th>$r.translate("cif.launched")</th><td>#if ($v.getStatistics().getLaunchCounter()) $v.getStatistics().getLaunchCounter() #else 0 #end</td></tr> - <tr><th>$r.translate("cif.downloaded")</th><td>#if ($v.getStatistics().getDowloadCounter()) $v.getStatistics().getDowloadCounter() #else 0 #end</td></tr> - #end - #end + <tr><th>$r.translate("cif.lastusage")</th><td>$r.formatDateAndTime($v.getStatistics().getLastUsage())</td></tr> + <tr><th>$r.translate("cif.usedbycnt")</th><td>$numUsers</td></tr> + <tr><th>$r.translate("cif.launched")</th><td>#if ($v.getStatistics().getLaunchCounter()) $v.getStatistics().getLaunchCounter() #else 0 #end</td></tr> + <tr><th>$r.translate("cif.downloaded")</th><td>#if ($v.getStatistics().getDowloadCounter()) $v.getStatistics().getDowloadCounter() #else 0 #end</td></tr> </tbody></table> </div> </div> + #end #if ($v.getManagedFlags().size() > 0) <div class="panel panel-default"> @@ -269,7 +267,7 @@ $r.translate("cif.managedflags") </h3> </div> - <div id="collapseManaged" class="panel-collapse collapse"> + <div id="collapseManaged" class="panel-collapse collapse in"> <div class="panel-body"> $r.translate("managed.resource.intro") </div>