Skip to content
Snippets Groups Projects
Commit 1085bcdc authored by srosse's avatar srosse
Browse files

Merge with 505e8a0ec85dc66faf0d0d0a61da4b281131d5c5

parents bb886976 de416c62
No related branches found
No related tags found
No related merge requests found
...@@ -280,7 +280,7 @@ public class RepositoryEntryDetailsController extends FormBasicController { ...@@ -280,7 +280,7 @@ public class RepositoryEntryDetailsController extends FormBasicController {
|| roles.contains(GroupRoles.coach.name()) || roles.contains(GroupRoles.coach.name())
|| roles.contains(GroupRoles.participant.name()); || roles.contains(GroupRoles.participant.name());
if (isMember) { if (isMember) {
Boolean isAuthor = Boolean.valueOf(roles.contains(GroupRoles.owner)); Boolean isAuthor = Boolean.valueOf(roles.contains(GroupRoles.owner.name()));
layoutCont.contextPut("isEntryAuthor", isAuthor); layoutCont.contextPut("isEntryAuthor", isAuthor);
} }
// push roles to velocity as well // push roles to velocity as well
......
...@@ -193,7 +193,7 @@ ...@@ -193,7 +193,7 @@
<tr><th>$r.translate("orderby.creationDate")</th><td>$r.formatDateAndTime($v.getCreationDate())</td></tr> <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> <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.access")</th><td>$accessI18n</td></tr>
<tr><th>$r.translate("cif.initialAuthor")</th><td>$v.getInitialAuthor()</td></tr> <tr><th>$r.translate("cif.initialAuthor")</th><td>$v.getInitialAuthor()</td></tr>
<tr> <tr>
...@@ -204,6 +204,7 @@ ...@@ -204,6 +204,7 @@
#end #end
</ul></td> </ul></td>
</tr> </tr>
#end
</tbody></table> </tbody></table>
<div class="panel-body"> <div class="panel-body">
<h5>$r.translate("details.extlinkheader")</h5> <h5>$r.translate("details.extlinkheader")</h5>
...@@ -235,6 +236,7 @@ ...@@ -235,6 +236,7 @@
</div> </div>
</div> </div>
#if ($referenceDetails && ($isEntryAuthor || $roles.isOLATAdmin() || $roles.isInstitutionalResourceManager()))
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading" data-toggle="collapse" data-target="#collapseUsage"> <div class="panel-heading" data-toggle="collapse" data-target="#collapseUsage">
<h3 class="panel-title"> <h3 class="panel-title">
...@@ -242,24 +244,20 @@ ...@@ -242,24 +244,20 @@
$r.translate("details.referenceinfoheader") $r.translate("details.referenceinfoheader")
</h3> </h3>
</div> </div>
<div id="collapseUsage" class="panel-collapse collapse"> <div id="collapseUsage" class="panel-collapse collapse in">
<table class="table table-condensed table-striped"><tbody> <table class="table table-condensed table-striped"><tbody>
#if ($referenceDetails)
<tr> <tr>
<th>$r.translate("details.referenceinfo")</th> <th>$r.translate("details.referenceinfo")</th>
<td>$referenceDetails</td> <td>$referenceDetails</td>
</tr> </tr>
#end <tr><th>$r.translate("cif.lastusage")</th><td>$r.formatDateAndTime($v.getStatistics().getLastUsage())</td></tr>
#if ($isAuthor || $roles.isOLATAdmin() || $roles.isInstitutionalResourceManager()) <tr><th>$r.translate("cif.usedbycnt")</th><td>$numUsers</td></tr>
<tr><th>$r.translate("cif.lastusage")</th><td>$r.formatDateAndTime($v.getStatistics().getLastUsage())</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.usedbycnt")</th><td>$numUsers</td></tr> <tr><th>$r.translate("cif.downloaded")</th><td>#if ($v.getStatistics().getDowloadCounter()) $v.getStatistics().getDowloadCounter() #else 0 #end</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
</tbody></table> </tbody></table>
</div> </div>
</div> </div>
#end
#if ($v.getManagedFlags().size() > 0) #if ($v.getManagedFlags().size() > 0)
<div class="panel panel-default"> <div class="panel panel-default">
...@@ -269,7 +267,7 @@ ...@@ -269,7 +267,7 @@
$r.translate("cif.managedflags") $r.translate("cif.managedflags")
</h3> </h3>
</div> </div>
<div id="collapseManaged" class="panel-collapse collapse"> <div id="collapseManaged" class="panel-collapse collapse in">
<div class="panel-body"> <div class="panel-body">
$r.translate("managed.resource.intro") $r.translate("managed.resource.intro")
</div> </div>
......
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