diff --git a/src/main/webapp/xnat-templates/screens/project/widgets/project_summary_status.vm b/src/main/webapp/xnat-templates/screens/project/widgets/project_summary_status.vm index e0dc1fd121971d01e9778c64c2e1cdb037826bf7..a907bdf18214ab997ecacb9e59a2f4ab2d0ee527 100644 --- a/src/main/webapp/xnat-templates/screens/project/widgets/project_summary_status.vm +++ b/src/main/webapp/xnat-templates/screens/project/widgets/project_summary_status.vm @@ -16,7 +16,7 @@ #if($other == 0) <DIV class="containerItem" style="color:grey">$other Other Experiments</DIV> #end -#if($data.getSession().getAttribute("userHelper").canCreate($project)) +#if($data.getSession().getAttribute("userHelper").isOwner($project.getId())) <BR><A ID="button5" href="$link.setAction("XDATActionRouter").addPathInfo("xdataction","protocols").addPathInfo( "search_element","xnat:projectData").addPathInfo("search_field","xnat:projectData.ID").addPathInfo( "search_value","$!{project.getId()}").addPathInfo("popup","$!popup")">Manage Custom Variables</A> diff --git a/src/main/webapp/xnat-templates/screens/xnat_projectData/xnat_projectData_summary_details.vm b/src/main/webapp/xnat-templates/screens/xnat_projectData/xnat_projectData_summary_details.vm index caccbb40955f3dae8c8e60d02abb603501b33c48..09579df0460d06ea887a3d297cedf37515ea8836 100644 --- a/src/main/webapp/xnat-templates/screens/xnat_projectData/xnat_projectData_summary_details.vm +++ b/src/main/webapp/xnat-templates/screens/xnat_projectData/xnat_projectData_summary_details.vm @@ -48,7 +48,7 @@ </tr> #end </table> -#if($data.getSession().getAttribute("userHelper").canCreate($project)) +#if($data.getSession().getAttribute("userHelper").isOwner($project.getId())) <BR><A ID="button1" href="$link.setAction("XDATActionRouter").addPathInfo("xdataction","edit").addPathInfo( "search_element","xnat:projectData").addPathInfo("search_field","xnat:projectData.ID").addPathInfo( "search_value","$!{project.getId()}").addPathInfo("popup","$!popup")">Edit Details</A> diff --git a/src/main/webapp/xnat-templates/screens/xnat_projectData/xnat_projectData_summary_management.vm b/src/main/webapp/xnat-templates/screens/xnat_projectData/xnat_projectData_summary_management.vm index 7e8f2d915464d6a3f9c8a51be56ae5417f9812ad..b6807c984a4e1aa91cf7ee6cf6e7d59f184718c6 100644 --- a/src/main/webapp/xnat-templates/screens/xnat_projectData/xnat_projectData_summary_management.vm +++ b/src/main/webapp/xnat-templates/screens/xnat_projectData/xnat_projectData_summary_management.vm @@ -101,6 +101,7 @@ </script> </td> </tr> + </table> <script language="javascript"> function summaryUserTabChange(obj){ diff --git a/src/main/webapp/xnat-templates/screens/xnat_projectData/xnat_projectData_summary_status.vm b/src/main/webapp/xnat-templates/screens/xnat_projectData/xnat_projectData_summary_status.vm index 17cccd6862557a850dffec8d747ea4d17caa6cd3..85be00042b6f3d5885cadc5b3423abc1dd82969d 100644 --- a/src/main/webapp/xnat-templates/screens/xnat_projectData/xnat_projectData_summary_status.vm +++ b/src/main/webapp/xnat-templates/screens/xnat_projectData/xnat_projectData_summary_status.vm @@ -7,7 +7,7 @@ "userHelper").getBrowseableElementDisplay($key).getSchemaElement().getPluralDescription()</DIV> #end -#if($data.getSession().getAttribute("userHelper").canCreate($project)) +#if($data.getSession().getAttribute("userHelper").isOwner($project.getId())) <BR><A ID="button5" href="$link.setAction("XDATActionRouter").addPathInfo("xdataction","protocols").addPathInfo( "search_element","xnat:projectData").addPathInfo("search_field","xnat:projectData.ID").addPathInfo( "search_value","$!{project.getId()}").addPathInfo("popup","$!popup")">Manage Custom Variables</A> diff --git a/src/main/webapp/xnat-templates/screens/xnat_projectData/xnat_projectData_summary_tabs.vm b/src/main/webapp/xnat-templates/screens/xnat_projectData/xnat_projectData_summary_tabs.vm index b734819aa394a94483200aac22e9f0950c8f9031..e154a266c0e3e7332b46f9fbdbbe0ed6e364a793 100644 --- a/src/main/webapp/xnat-templates/screens/xnat_projectData/xnat_projectData_summary_tabs.vm +++ b/src/main/webapp/xnat-templates/screens/xnat_projectData/xnat_projectData_summary_tabs.vm @@ -5,12 +5,10 @@ <li class="selected"><a href="#tab1"><em>Details</em></a></li> #set($canReadSubjects=$data.getSession().getAttribute("userHelper").canRead( "xnat:subjectData/project","$project.getId()")) - #if($canReadSubjects) - #if($data.getSession().getAttribute("userHelper").canDelete($project)) + #if($data.getSession().getAttribute("userHelper").isOwner($project.getId())) <li><a href="#tab3"><em>Access</em></a></li> <li><a href="#othermgmt"><em>Manage</em></a></li> <li><a href="#tab4"><em>Pipelines</em></a></li> - #end #end #foreach($tab in $tabs) <li><a href="#$tab.getProperty("divName")"><em>$tab.getProperty("title") @@ -23,8 +21,7 @@ <p>#parse($turbineUtils.getTemplateName("_summary_details","xnat:projectData",$project.getId()))</p> </div> - #if($canReadSubjects) - #if($data.getSession().getAttribute("userHelper").canCreate($project)) + #if($data.getSession().getAttribute("userHelper").isOwner($project.getId())) <div id="tab3"> <p>#parse($turbineUtils.getTemplateName( "_summary_management","xnat:projectData",$project.getId()))</p> @@ -37,7 +34,6 @@ <p>#parse($turbineUtils.getTemplateName( "_summary_pipeline","xnat:projectData",$project.getId()))</p> </div> - #end #end #foreach($tab in $tabs) <div id="$tab.getProperty("divName")"> @@ -60,14 +56,10 @@ window.summaryTabView = new YAHOO.widget.TabView('projectSummary'); var oButton1 = new YAHOO.widget.Button("button1"); var oButton2 = new YAHOO.widget.Button("button2"); - #if($canReadSubjects) - #if($data.getSession().getAttribute("userHelper").canDelete($project)) - var oButton3 = new YAHOO.widget.Button("button3"); - #end - #if($data.getSession().getAttribute("userHelper").canCreate($project)) - var oButton4 = new YAHOO.widget.Button("button4"); - var oButton5 = new YAHOO.widget.Button("button5"); - #end + #if($data.getSession().getAttribute("userHelper").isOwner($project.getId())) + var oButton3 = new YAHOO.widget.Button("button3"); + var oButton4 = new YAHOO.widget.Button("button4"); + var oButton5 = new YAHOO.widget.Button("button5"); #end