svn commit: r605285 - /incubator/lokahi/lokahi/trunk/src/www/Core/Project/details.vm

[to...@apache.org]

Author: toback
Date: Tue Dec 18 10:33:12 2007
New Revision: 605285

URL: http://svn.apache.org/viewvc?rev=605285&view=rev
Log:
Changed the details page to pass the project object that we already have to speed up load times of the project page.

Modified:
    incubator/lokahi/lokahi/trunk/src/www/Core/Project/details.vm

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Project/details.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Project/details.vm?rev=605285&r1=605284&r2=605285&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Project/details.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Project/details.vm Tue Dec 18 10:33:12 2007
@@ -49,16 +49,16 @@
 		<a class="info" href="$appRoot/Core/Project/details.vm?projectId=$project.getPk()">All</a> &nbsp;
   </td> 
 	<td colspan="2" align="right">
-#if ($User.isAllowed("AddVirtualHost", $projectId) || $User.isAllowed("AddVirtualHostToProject", $projectId) || $User.isAllowed("AddUser", $projectId) || $User.isAllowed("AddUserToProject", $projectId) || $User.isAllowed("DeleteProject", $projectId))
+#if ($User.isAllowed("AddVirtualHost", $project) || $User.isAllowed("AddVirtualHostToProject", $project) || $User.isAllowed("AddUser", $project) || $User.isAllowed("AddUserToProject", $project) || $User.isAllowed("DeleteProject", $project))
 	    <select name=methodToCall onchange='OnChange(this);'>
        	      <option value="" selected>Select Action</option>
-#if ($User.isAllowed("AddVirtualHost", $projectId) || $User.isAllowed("AddVirtualHostToProject", $projectId))
+#if ($User.isAllowed("AddVirtualHost", $project) || $User.isAllowed("AddVirtualHostToProject", $project))
               <option value="$appRoot/Template/addVhost.vm?project=$projectId">Add a VirtualHost</option>
 #end
-#if ($User.isAllowed("AddUser", $projectId) || $User.isAllowed("AddUserToProject", $projectId))
+#if ($User.isAllowed("AddUser", $project) || $User.isAllowed("AddUserToProject", $project))
               <option value="$appRoot/Core/User/addToProject.vm?project=$projectId">Add a User</option>
 #end
-#if ($User.isAllowed("DeleteProject", $projectId))
+#if ($User.isAllowed("DeleteProject", $project))
               <option value="$appRoot/Core/Project/delete.vm?project=$projectId">Delete this Project</option>
 #end
             </select>
@@ -90,24 +90,24 @@
 			<td> &nbsp; </td>
 			<td><a href="$appRoot/Apache/Pool/view.vm?id=$!{ap.getPk()}">$!{ap.getName()}</a></td>
 			<td align="right">
-      #if ($User.isAllowed("AddContext", $projectId) || $User.isAllowed("AddUser", $projectId) || $User.isAllowed("AddUserToProject", $projectId) || $User.isAllowed("DeleteVirtualHost", $projectId, $vhost) || $User.isAllowed("ViewVirtualHost", $projectId, $vhost) || $User.isAllowed("UpdateVirtualHost", $projectId, $vhost))
+      #if ($User.isAllowed("AddContext", $project) || $User.isAllowed("AddUser", $project) || $User.isAllowed("AddUserToProject", $project) || $User.isAllowed("DeleteVirtualHost", $project, $vhost) || $User.isAllowed("ViewVirtualHost", $project, $vhost) || $User.isAllowed("UpdateVirtualHost", $project, $vhost))
 	      <select name=methodToCall onchange='OnChange(this);'>
        	<option value="" selected>Select Action</option>
-        #if ($User.isAllowed("AddContext", $projectId))
+        #if ($User.isAllowed("AddContext", $project))
           <option value="$appRoot/Tomcat/Entity/add.vm?id=$!{vhost.getPk()}&projectId=$projectId">Add a context</option>
           <option value="$appRoot/Tomcat/Entity/addExistingToVhost.vm?v=$!{vhost.getPk()}&p=$projectId">Add an existing context</option>
         #end
-        #if ($User.isAllowed("AddUser", $projectId) || $User.isAllowed("AddUserToProject", $projectId))
+        #if ($User.isAllowed("AddUser", $project) || $User.isAllowed("AddUserToProject", $project))
           <option value="$appRoot/Core/User/addToProject.vm?project=$projectId">Add a User</option>
         #end
-        <!-- $User.isAllowed("DeleteVirtualHost", $projectId, $vhost) -->
-        #if ($User.isAllowed("DeleteVirtualHost", $projectId, $vhost))
+        <!-- $User.isAllowed("DeleteVirtualHost", $project, $vhost) -->
+        #if ($User.isAllowed("DeleteVirtualHost", $project, $vhost))
           <option value="$appRoot/Apache/Entity/delete.vm?id=$!{vhost.getPk()}">Delete this Vhost</option>
         #end
-        #if ($User.isAllowed("UpdateVirtualHost", $projectId, $vhost))
+        #if ($User.isAllowed("UpdateVirtualHost", $project, $vhost))
           <option value="$appRoot/Apache/Entity/modify.vm?id=$!{vhost.getPk()}&p=$projectId">Modify this Vhost</option>
         #end
-        #if ($User.isAllowed("ViewVirtualHost", $projectId, $vhost))
+        #if ($User.isAllowed("ViewVirtualHost", $project, $vhost))
           <option value="$appRoot/Apache/Entity/view.vm?id=$!{vhost.getPk()}">View this Vhost</option>
         #end
         </select>
@@ -119,7 +119,7 @@
         #set($cc = 1)
   	    #foreach ($context in $contexts)
   	      <!-- $projectContexts.remove($context) -->
-  	      #if($User.isAllowed("ViewContext",$projectId, $context) || $User.isAllowed("ReloadContext",$projectId, $context) || $User.isAllowed("StopContext",$projectId, $context) || $User.isAllowed("StartContext",$projectId, $context) || $User.isAllowed("UpdateContext",$projectId, $context) || $User.isAllowed("DeleteContext",$projectId, $context) || $User.isAllowed("UndeployContext",$projectId, $context) || $User.isAllowed("RedeployContext",$projectId, $context) || $User.isAllowed("InstallContext",$projectId, $context) || $User.isAllowed("ListContext",$projectId, $context) || $User.isAllowed("SessionsOfContext",$projectId, $context) || $User.isAllowed("StatusOfContext",$projectId, $context))
+  	      #if($User.isAllowed("ViewContext",$project, $context) || $User.isAllowed("ReloadContext",$project, $context) || $User.isAllowed("StopContext",$project, $context) || $User.isAllowed("StartContext",$project, $context) || $User.isAllowed("UpdateContext",$project, $context) || $User.isAllowed("DeleteContext",$project, $context) || $User.isAllowed("UndeployContext",$project, $context) || $User.isAllowed("RedeployContext",$project, $context) || $User.isAllowed("InstallContext",$project, $context) || $User.isAllowed("ListContext",$project, $context) || $User.isAllowed("SessionsOfContext",$project, $context) || $User.isAllowed("StatusOfContext",$project, $context))
   			  #set ($tomcatPool = $context.getTomcatPool())
   			  #if (!$context.hasTomcatPool())
   			    <tr class="headercolor$c">