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

[oscar at devel.lifetype.net]

Author: oscar
Date: 2006-10-22 21:11:11 +0000 (Sun, 22 Oct 2006)
New Revision: 4166

Modified:
   plog/trunk/class/action/admin/adminaddbloguseraction.class.php
   plog/trunk/class/action/admin/adminnewbloguseraction.class.php
   plog/trunk/class/action/admin/adminshowblogusersaction.class.php
   plog/trunk/templates/admin/addbloguser.template
Log:
fixed an issue with the "new blog user" view not displaying the permissions if there was an error and added a couple of permissions more to handle blog users


Modified: plog/trunk/class/action/admin/adminaddbloguseraction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminaddbloguseraction.class.php	2006-10-22 20:42:56 UTC (rev 4165)
+++ plog/trunk/class/action/admin/adminaddbloguseraction.class.php	2006-10-22 21:11:11 UTC (rev 4166)
@@ -1,7 +1,7 @@
 <?php
 
 	lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
-    lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
+    lt_include( PLOG_CLASS_PATH."class/view/admin/adminnewbloguserview.class.php" );
     lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
     lt_include( PLOG_CLASS_PATH."class/dao/users.class.php" );
     lt_include( PLOG_CLASS_PATH."class/dao/userpermissions.class.php" );
@@ -32,11 +32,15 @@
 			if( $this->_sendNotification )
 				$this->registerFieldValidator( "newBlogUserText", new StringValidator());
 			else
-				$this->registerField( "newBlogUserText" );				
+				$this->registerField( "newBlogUserText" );		
+						
 			$this->registerField( "sendNotification" );
-			$view = new AdminTemplatedView( $this->_blogInfo, "addbloguser" );
+			$this->registerField( "perm" );
+			$view = new AdminNewBlogUserView( $this->_blogInfo );
 			$view->setErrorMessage( $this->_locale->tr("error_adding_user"));
 			$this->setValidationErrorView( $view );
+			
+			$this->requirePermission( "add_blog_user" );
         }
 
         function sendNotificationEmail( $userInfo )

Modified: plog/trunk/class/action/admin/adminnewbloguseraction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminnewbloguseraction.class.php	2006-10-22 20:42:56 UTC (rev 4165)
+++ plog/trunk/class/action/admin/adminnewbloguseraction.class.php	2006-10-22 21:11:11 UTC (rev 4166)
@@ -15,6 +15,8 @@
     	function AdminNewBlogUserAction( $actionInfo, $request )
         {
         	$this->AdminAction( $actionInfo, $request );
+
+			$this->requirePermission( "add_blog_user" );
         }
 
         function perform()

Modified: plog/trunk/class/action/admin/adminshowblogusersaction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminshowblogusersaction.class.php	2006-10-22 20:42:56 UTC (rev 4165)
+++ plog/trunk/class/action/admin/adminshowblogusersaction.class.php	2006-10-22 21:11:11 UTC (rev 4166)
@@ -15,6 +15,8 @@
     	function AdminShowBlogUsersAction( $actionInfo, $request )
         {
         	$this->AdminAction( $actionInfo, $request );
+
+			$this->requirePermission( "view_blog_users" );
         }
 
         function perform()

Modified: plog/trunk/templates/admin/addbloguser.template
===================================================================
--- plog/trunk/templates/admin/addbloguser.template	2006-10-22 20:42:56 UTC (rev 4165)
+++ plog/trunk/templates/admin/addbloguser.template	2006-10-22 21:11:11 UTC (rev 4166)
@@ -28,10 +28,11 @@
       <label for="perm">{$locale->tr("permissions")}</label>
       <span class="required"></span>
       <div class="formHelp">{$locale->tr("new_blog_permissions_help")}</div>     
-     	{foreach from=$perms item=perm}
-     	 {if !$perm->isAdminOnlyPermission()}
-     	 <input type="checkbox" class="checkbox" name="perm[]" value="{$perm->getId()}" />
-     	 {$locale->tr($perm->getDescription())}<br/>
+     	{foreach from=$perms item=permission}
+     	 {if !$permission->isAdminOnlyPermission()}
+		 {assign var=permId value=$permission->getId()}
+     	 <input type="checkbox" class="checkbox" name="perm[{$permission->getId()}]" value="{$permission->getId()}" {if $perm[$permId]==$permission->getId()}checked="checked"{/if} />
+     	 {$locale->tr($permission->getDescription())}<br/>
      	 {/if}
      	{/foreach}
      </div>