XNAT-4261, XNAT-4415

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",

src/main/webapp/xnat-templates/screens/topBar/Browse/Default.vm

 <!-- 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>

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
     <!-- -->