diff --git a/src/main/webapp/WEB-INF/tags/page/xnat.tag b/src/main/webapp/WEB-INF/tags/page/xnat.tag index df3ab8e8e0ecfdd3d300f79acb682a80701b44f2..ec4046ad6e90330ce56982abf7f9e63cd674539c 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 6b0f9212940c143bd00eb28a7378ae9ee7570749..3754ef34ae351565d59d732d0ab8b2c8b36d8dca 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 572d690d075bfbbd94e3feb0c878b5a52501f98b..a8f4f6e089f9d4028ba7b8ced2a40efd8d787427 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 <!-- -->