incubator-lokahi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tob...@apache.org
Subject svn commit: r475984 - in /incubator/lokahi/lokahi/trunk/src/www/Core/User: index.vm menu/global.vm menu/indiv.vm
Date Thu, 16 Nov 2006 23:37:34 GMT
Author: toback
Date: Thu Nov 16 15:37:33 2006
New Revision: 475984

URL: http://svn.apache.org/viewvc?view=rev&rev=475984
Log:
Fixes to add the auth back to these menus.

Modified:
    incubator/lokahi/lokahi/trunk/src/www/Core/User/index.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/User/menu/global.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/User/menu/indiv.vm

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/User/index.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/User/index.vm?view=diff&rev=475984&r1=475983&r2=475984
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/User/index.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/User/index.vm Thu Nov 16 15:37:33 2006
@@ -6,9 +6,9 @@
 ## to you under the Apache License, Version 2.0 (the
 ## "License"); you may not use this file except in compliance
 ## with the License.  You may obtain a copy of the License at
-## 
+##
 ##   http://www.apache.org/licenses/LICENSE-2.0
-## 
+##
 ## Unless required by applicable law or agreed to in writing,
 ## software distributed under the License is distributed on an
 ## "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -34,17 +34,18 @@
         #if($User.isAllowed("AddUserToProject"))
         <a href="$appRoot/Core/User/addToProject.vm">&nbsp;Add user to Project&nbsp;</a><br
/>
         #end
-        #if($User.isAllowed("AddUserToProject"))
+        #if($User.isAllowed("AddUser"))
         <a href="$appRoot/Core/User/addAdmin.vm">&nbsp;Add Admin&nbsp;</a><br
/>
         #end
-
+        #if($User.isAllowed("AddUser"))
         <A href="$appRoot/Core/User/add.vm">Add User</a><br />
+        #end
         <A href="$appRoot/Core/User/list.vm">List Users</a><br />
         <br />
       </td>
     </tr>
   </table>
-</form>
+
 
 <br />
 </div>

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/User/menu/global.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/User/menu/global.vm?view=diff&rev=475984&r1=475983&r2=475984
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/User/menu/global.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/User/menu/global.vm Thu Nov 16 15:37:33 2006
@@ -6,9 +6,9 @@
 ## to you under the Apache License, Version 2.0 (the
 ## "License"); you may not use this file except in compliance
 ## with the License.  You may obtain a copy of the License at
-## 
+##
 ##   http://www.apache.org/licenses/LICENSE-2.0
-## 
+##
 ## Unless required by applicable law or agreed to in writing,
 ## software distributed under the License is distributed on an
 ## "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -21,9 +21,17 @@
 <select name=methodToCall onchange='OnChange(this);'>
   <option value="" selected>Select Action
   <option value="$appRoot/Core/User/details.vm">&nbsp;Details&nbsp;</option>
+  #if($User.isAllowed("AddUser"))
   <option value="$appRoot/Core/User/add.vm">&nbsp;Add&nbsp;</option>
+  #end
+  #if($User.isAllowed("UpdateUser"))
   <option value="$appRoot/Core/User/update.vm">&nbsp;Update&nbsp;</option>
+  #end
+  #if($User.isAllowed("DeleteUser"))
   <option value="$appRoot/Core/User/delete.vm">&nbsp;Delete&nbsp;</option>
+  #end
+  #if($User.isAllowed("AddUserToProject"))
   <option value="$appRoot/Core/User/addToProject.vm">&nbsp;Add User to Project&nbsp;</option>
+  #end
 </select>
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/User/menu/indiv.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/User/menu/indiv.vm?view=diff&rev=475984&r1=475983&r2=475984
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/User/menu/indiv.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/User/menu/indiv.vm Thu Nov 16 15:37:33 2006
@@ -6,9 +6,9 @@
 ## to you under the Apache License, Version 2.0 (the
 ## "License"); you may not use this file except in compliance
 ## with the License.  You may obtain a copy of the License at
-## 
+##
 ##   http://www.apache.org/licenses/LICENSE-2.0
-## 
+##
 ## Unless required by applicable law or agreed to in writing,
 ## software distributed under the License is distributed on an
 ## "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -21,7 +21,11 @@
 <select name=methodToCall onchange='OnChange(this);'>
   <option value="" selected>Select Action
   <option value="$appRoot/Core/User/details.vm?id=$!{ent.getPk()}">&nbsp;Details&nbsp;</option>
+  #if($User.isAllowed("UpdateUser"))
   <option value="$appRoot/Core/User/update.vm?id=$!{ent.getPk()}">&nbsp;Update&nbsp;</option>
+  #end
+  #if($User.isAllowed("DeleteUser"))
   <option value="$appRoot/Core/User/delete.vm?id=$!{ent.getPk()}">&nbsp;Delete&nbsp;</option>
+  #end
 </select>
 



Mime
View raw message