[pLog-svn] r4277 - in plog/trunk: class/action/admin templates/admin

[oscar at devel.lifetype.net]

Author: oscar
Date: 2006-11-11 14:06:53 +0000 (Sat, 11 Nov 2006)
New Revision: 4277

Modified:
   plog/trunk/class/action/admin/admindeletepermissionsaction.class.php
   plog/trunk/class/action/admin/admineditpermissionaction.class.php
   plog/trunk/class/action/admin/adminupdatepermissionaction.class.php
   plog/trunk/templates/admin/permissions.template
   plog/trunk/templates/admin/siteusers.template
Log:
small fix for the integration of permissions with the "permissions" management actions and views


Modified: plog/trunk/class/action/admin/admindeletepermissionsaction.class.php
===================================================================
--- plog/trunk/class/action/admin/admindeletepermissionsaction.class.php	2006-11-11 13:33:18 UTC (rev 4276)
+++ plog/trunk/class/action/admin/admindeletepermissionsaction.class.php	2006-11-11 14:06:53 UTC (rev 4277)
@@ -37,7 +37,7 @@
 			$view->setErrorMessage( $this->_locale->tr("error_incorrect_permission_id"));
 			$this->setValidationErrorView( $view );		
 			
-			$this->requirePermission( "update_permission" );
+			$this->requireAdminPermission( "update_permission" );
         }
 
 		/**

Modified: plog/trunk/class/action/admin/admineditpermissionaction.class.php
===================================================================
--- plog/trunk/class/action/admin/admineditpermissionaction.class.php	2006-11-11 13:33:18 UTC (rev 4276)
+++ plog/trunk/class/action/admin/admineditpermissionaction.class.php	2006-11-11 14:06:53 UTC (rev 4277)
@@ -24,7 +24,7 @@
 			$errorView->setErrorMessage( $this->_locale->tr("error_fetching_permission" ));			
 			$this->setValidationErrorView( $errorView );
 			
-			$this->requirePermission( "update_permission" );
+			$this->requireAdminPermission( "update_permission" );
 		}
 		
         function perform()

Modified: plog/trunk/class/action/admin/adminupdatepermissionaction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminupdatepermissionaction.class.php	2006-11-11 13:33:18 UTC (rev 4276)
+++ plog/trunk/class/action/admin/adminupdatepermissionaction.class.php	2006-11-11 14:06:53 UTC (rev 4277)
@@ -30,7 +30,7 @@
 			$errorView->setErrorMessage( $this->_locale->tr("error_updating_permission" ));			
 			$this->setValidationErrorView( $errorView );
 			
-			$this->requirePermission( "update_permission" );			
+			$this->requireAdminPermission( "update_permission" );			
 		}
 		
         function perform()

Modified: plog/trunk/templates/admin/permissions.template
===================================================================
--- plog/trunk/templates/admin/permissions.template	2006-11-11 13:33:18 UTC (rev 4276)
+++ plog/trunk/templates/admin/permissions.template	2006-11-11 14:06:53 UTC (rev 4277)
@@ -39,7 +39,7 @@
    </td>
    <td>
      <div class="list_action_button">
-	   {check_perms perm=update_permission}	
+	   {check_perms adminperm=update_permission}	
        {if !$perm->isCorePermission()}<a href="?op=editPermission&amp;permId={$perm->getId()}"><img src="imgs/admin/icon_edit-16.png" alt="{$locale->tr("edit")}" /></a>{/if}
        {if !$perm->isCorePermission()}<a href="?op=deletePermission&amp;permId={$perm->getId()}"><img src="imgs/admin/icon_delete-16.png" alt="{$locale->tr("delete")}" /></a>{/if}
 	  {/check_perms}
@@ -51,7 +51,7 @@
  </table>
  </div>
  <div id="list_action_bar">
-  {check_perms perm=update_permission}		
+  {check_perms adminperm=update_permission}		
   <input type="hidden" name="op" value="deletePermissions"/>
   <input type="submit" name="Delete selected" value="{$locale->tr("delete")}"/>
   {/check_perms}

Modified: plog/trunk/templates/admin/siteusers.template
===================================================================
--- plog/trunk/templates/admin/siteusers.template	2006-11-11 13:33:18 UTC (rev 4276)
+++ plog/trunk/templates/admin/siteusers.template	2006-11-11 14:06:53 UTC (rev 4277)
@@ -60,6 +60,14 @@
                         </td>
                         <td class="col_highlighted">
                             <a href="?op=editSiteUser&amp;userId={$siteuser->getId()}">{$siteuser->getUsername()|truncate:20:"..."}</a>
+							{assign var=userPerms value=$siteuser->getPermissions(0)}
+							<script type="text/javascript">
+							  myTooltip = new YAHOO.widget.Tooltip("myTooltip", {literal}{{/literal}  
+							    context:"user_{$siteuser->getId()}",  
+								text:"{$locale->tr("permissions")}:<br/>{foreach from=$userPerms item=perm}{$perm->getPermissionName()}<br/>{/foreach}"
+								{literal}}{/literal} );
+							</script>
+
                         </td>
                         <td>
                             {$siteuser->getFullName()|truncate:70:"..."}