From bfa4f0e247156572bd25fb976ab4c3eed62879f1 Mon Sep 17 00:00:00 2001
From: "Mark M. Florida" <markflorida@wustl.edu>
Date: Thu, 14 Jul 2016 17:02:41 -0500
Subject: [PATCH] XNAT-4261, XNAT-4415
---
src/main/webapp/WEB-INF/tags/page/xnat.tag | 8 +++++++-
.../xnat-templates/screens/topBar/Browse/Default.vm | 3 ++-
.../webapp/xnat-templates/screens/topBar/New/Default.vm | 2 +-
3 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/main/webapp/WEB-INF/tags/page/xnat.tag b/src/main/webapp/WEB-INF/tags/page/xnat.tag
index df3ab8e8..ec4046ad 100644
--- a/src/main/webapp/WEB-INF/tags/page/xnat.tag
+++ b/src/main/webapp/WEB-INF/tags/page/xnat.tag
@@ -681,7 +681,13 @@ ${bodyTop}
<c:import url="/xapi/siteConfig/buildInfo" var="buildInfo" scope="session"/>
- var buildInfo = XNAT.data.siteConfig.buildInfo = ${buildInfo};
+ extend(true, XNAT, {
+ data: { siteConfig: {
+ buildInfo: ${buildInfo}
+ }}
+ });
+
+ var buildInfo = XNAT.data.siteConfig.buildInfo;
var buildInfoSample = {
"Application-Name": "XNAT",
diff --git a/src/main/webapp/xnat-templates/screens/topBar/Browse/Default.vm b/src/main/webapp/xnat-templates/screens/topBar/Browse/Default.vm
index 6b0f9212..3754ef34 100644
--- a/src/main/webapp/xnat-templates/screens/topBar/Browse/Default.vm
+++ b/src/main/webapp/xnat-templates/screens/topBar/Browse/Default.vm
@@ -1,9 +1,10 @@
<!-- Sequence: 10 -->
+
<!-- Browse/Default -->
<li class="hidden"><a href="#BrowseProjects">Projects</a>
<ul id="browse-projects">
<!-- Sequence: 10 -->
- #if($siteConfig.getUiAllowNonAdminProjectCreation() || $data.getSession().getAttribute("userHelper").canCreate("xnat:subjectData"))
+ #if($siteConfig.getUiAllowNonAdminProjectCreation() || $data.getSession().getAttribute("userHelper").canCreate("xnat:subjectData/project"))
<li class="create-project hidden"><a href="$link.setPage("XDATScreen_add_xnat_projectData.vm")">Create $displayManager.getSingularDisplayNameForProject()</a></li>
#end
</ul>
diff --git a/src/main/webapp/xnat-templates/screens/topBar/New/Default.vm b/src/main/webapp/xnat-templates/screens/topBar/New/Default.vm
index 572d690d..a8f4f6e0 100644
--- a/src/main/webapp/xnat-templates/screens/topBar/New/Default.vm
+++ b/src/main/webapp/xnat-templates/screens/topBar/New/Default.vm
@@ -5,7 +5,7 @@
#* @vtlvariable name="displayManager" type="org.nrg.xdat.display.DisplayManager" *#
#* @vtlvariable name="project" type="org.nrg.xdat.om.XnatProjectdata" *#
<!-- Sequence: 10 -->
- #if($siteConfig.getUiAllowNonAdminProjectCreation() || $data.getSession().getAttribute("userHelper").canCreate("xnat:subjectData"))
+ #if($siteConfig.getUiAllowNonAdminProjectCreation() || $data.getSession().getAttribute("userHelper").canCreate("xnat:subjectData/project"))
<li><a href="$link.setPage("XDATScreen_add_xnat_projectData.vm")">$displayManager.getSingularDisplayNameForProject()</a></li>
#end
<!-- -->
--
GitLab