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

oscar at devel.lifetype.net oscar at devel.lifetype.net
Tue Oct 24 22:02:32 GMT 2006


Author: oscar
Date: 2006-10-24 22:02:31 +0000 (Tue, 24 Oct 2006)
New Revision: 4184

Modified:
   plog/trunk/class/action/admin/adminaddcustomfieldaction.class.php
   plog/trunk/class/action/admin/adminblogcustomfieldsaction.class.php
   plog/trunk/class/action/admin/adminnewcustomfieldaction.class.php
   plog/trunk/templates/admin/customfields.template
Log:
implemented permissions for managing custom fields


Modified: plog/trunk/class/action/admin/adminaddcustomfieldaction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminaddcustomfieldaction.class.php	2006-10-24 21:50:58 UTC (rev 4183)
+++ plog/trunk/class/action/admin/adminaddcustomfieldaction.class.php	2006-10-24 22:02:31 UTC (rev 4184)
@@ -35,7 +35,9 @@
 			$this->_form->registerField( "fieldHidden" );
 			$this->_form->registerField( "fieldId" );
 			$this->_form->registerField( "fieldValues" );
-			$this->setValidationErrorView( new AdminTemplatedView( $this->_blogInfo, "newcustomfield" ));
+			$view = new AdminTemplatedView( $this->_blogInfo, "newcustomfield" );
+			$view->setErrorMessage( $this->_locale->tr("error_adding_custom_field"));
+			$this->setValidationErrorView( $view );
 			
 			$this->requirePermission( "add_custom_field" );
         }
@@ -78,13 +80,16 @@
 			$this->notifyEvent( EVENT_PRE_CUSTOM_FIELD_ADD, Array( "field" => &$customField ));
 			
 			$result = $fields->addCustomField( $customField );
+			
+			if( $this->userHasPermission( "view_custom_fields" ))
+				$this->_view = new AdminCustomFieldsListView( $this->_blogInfo );
+			else
+				$this->_view = new AdminTemplatedView( $this->_blogInfo, "newcustomfield" );
 											   
-			if( !$result ) {
-				$this->_view = new AdminCustomFieldsListView( $this->_blogInfo );
+			if( !$result ) {				
 				$this->_view->setErrorMessage( $this->_locale->tr("error_adding_custom_field" ));
 			}
 			else {
-				$this->_view = new AdminCustomFieldsListView( $this->_blogInfo );
 				$this->_view->setSuccessMessage( $this->_locale->pr( "custom_field_added_ok", $customField->getName()));
 				
 				// throw the post-event if all went fine

Modified: plog/trunk/class/action/admin/adminblogcustomfieldsaction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminblogcustomfieldsaction.class.php	2006-10-24 21:50:58 UTC (rev 4183)
+++ plog/trunk/class/action/admin/adminblogcustomfieldsaction.class.php	2006-10-24 22:02:31 UTC (rev 4184)
@@ -16,6 +16,8 @@
         function AdminBlogCustomFieldsAction( $actionInfo, $request )
         {
         	$this->AdminAction( $actionInfo, $request );
+
+			$this->requirePermission( "view_custom_fields" );
         }
 
         /**

Modified: plog/trunk/class/action/admin/adminnewcustomfieldaction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminnewcustomfieldaction.class.php	2006-10-24 21:50:58 UTC (rev 4183)
+++ plog/trunk/class/action/admin/adminnewcustomfieldaction.class.php	2006-10-24 22:02:31 UTC (rev 4184)
@@ -12,7 +12,7 @@
     class AdminNewCustomFieldAction extends AdminAction 
 	{
 
-        function AdminBlogCustomFieldsAction( $actionInfo, $request )
+        function AdminNewCustomFieldAction( $actionInfo, $request )
         {
         	$this->AdminAction( $actionInfo, $request );
 

Modified: plog/trunk/templates/admin/customfields.template
===================================================================
--- plog/trunk/templates/admin/customfields.template	2006-10-24 21:50:58 UTC (rev 4183)
+++ plog/trunk/templates/admin/customfields.template	2006-10-24 22:02:31 UTC (rev 4184)
@@ -24,7 +24,7 @@
 				     <input class="checkbox" type="checkbox" name="fieldIds[{$field->getId()}]" id="checks_1" value="{$field->getId()}" />				   
 				   </td>
 				   <td class="col_highlighted">
-				     <a href="admin.php?op=editCustomField&amp;fieldId={$field->getId()}">{$field->getName()}</a>
+				     {check_perms perm=update_custom_field}<a href="admin.php?op=editCustomField&amp;fieldId={$field->getId()}">{/check_perms}{$field->getName()}{check_perms perm=update_custom_field}</a>{/check_perms}
 				   </td>
 				   <td>
 				     {$field->getDescription()}
@@ -41,8 +41,10 @@
 				 </td>
                  <td>
                     <div class="list_action_button">
+					   {check_perms perm=update_custom_field}
                        <a href="?op=editCustomField&amp;fieldId={$field->getId()}"><img src="imgs/admin/icon_edit-16.png" alt="{$locale->tr("editCustomField")}" /></a>
                        <a href="?op=deleteCustomField&amp;fieldId={$field->getId()}"><img src="imgs/admin/icon_delete-16.png" alt="{$locale->tr("delete")}" /></a>
+					   {/check_perms}
                      </div>
                   </td>				 
 			  </tr>
@@ -52,8 +54,10 @@
         </div>
         <div id="list_action_bar">
 	    {adminpager style=list}
+		{check_perms perm=update_custom_field}
             <input type="submit" name="delete" value="{$locale->tr("delete")}" class="submit" />
             <input type="hidden" name="op" value="deleteCustomFields" />
+		{/check_perms}
         </div>
 </form>
 {include file="$admintemplatepath/footernavigation.template"}



More information about the pLog-svn mailing list