Fixed dismember bug and add dismember link to nav path for users with permission.

3 files changed, 13 insertions, 5 deletions

diff --git a/edit_pigeonholes.php b/edit_pigeonholes.php
index 34ac79a..d067c13 100644
--- a/edit_pigeonholes.php
+++ b/edit_pigeonholes.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * $Header: /cvsroot/bitweaver/_bit_pigeonholes/edit_pigeonholes.php,v 1.30 2007/10/10 18:07:17 wjames5 Exp $
+ * $Header: /cvsroot/bitweaver/_bit_pigeonholes/edit_pigeonholes.php,v 1.31 2007/11/19 10:52:42 nickpalmer Exp $
  *
  * Copyright ( c ) 2004 bitweaver.org
  * Copyright ( c ) 2003 tikwiki.org
@@ -8,7 +8,7 @@
  * All Rights Reserved. See copyright.txt for details and a complete list of authors.
  * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details
  *
- * $Id: edit_pigeonholes.php,v 1.30 2007/10/10 18:07:17 wjames5 Exp $
+ * $Id: edit_pigeonholes.php,v 1.31 2007/11/19 10:52:42 nickpalmer Exp $
  * @package pigeonholes
  * @subpackage functions
  */
@@ -88,11 +88,15 @@ if( !empty( $_REQUEST['action'] ) || isset( $_REQUEST["confirm"] ) ) {
 	}
 
 	if( $_REQUEST['action'] == 'dismember' && !empty( $_REQUEST['pigeonhole_content_id'] ) && !empty( $_REQUEST['parent_id'] ) ) {
-		if( $gContent->expungePigeonholeMember( array( 'parent_id' => $_REQUEST['pigeonhole_content_id'], 'member_id' => $_REQUEST['parent_id'] ) ) ) {
+		if( $gContent->expungePigeonholeMember( array( 'parent_id' => $_REQUEST['parent_id'], 'member_id' => $_REQUEST['pigeonhole_content_id'] ) ) ) {
 			$feedback['success'] = tra( 'The item was successfully removed' );
 		} else {
 			$feedback['error'] = tra( 'The item could not be removed' );
 		}
+		// Have we been asked to return somewhere else?
+		if (!empty($_REQUEST['return_uri'])) {
+			bit_redirect($_REQUEST['return_uri']);
+		}
 		// used to avoid displaying edit form
 		unset( $_REQUEST['action'] );
 	}
diff --git a/templates/section_inc.tpl b/templates/section_inc.tpl
index a732144..88e2092 100644
--- a/templates/section_inc.tpl
+++ b/templates/section_inc.tpl
@@ -36,7 +36,7 @@
 				<li>
 					<a href="{$smarty.const.BIT_ROOT_URL}index.php?content_id={$pigeonMember.content_id}">{$pigeonMember.title|escape}</a>
 					{if $gBitUser->hasPermission( 'p_pigeonholes_edit' )}
-						&nbsp; {smartlink ititle="Remove Item" ibiticon="icons/edit-delete" expand_all=$smarty.request.expand_all action=dismember structure_id=$sid parent_id=$pigeonMember.content_id content_id=$pigeonItem.content_id}
+						&nbsp; {smartlink ititle="Remove From Category" ibiticon="icons/edit-delete" expand_all=$smarty.request.expand_all action=dismember structure_id=$sid parent_id=$pigeonMember.parent_id pigeonhole_content_id=$pigeonMember.content_id}
 					{/if}
 				</li>
 
diff --git a/templates/service_nav_path_inc.tpl b/templates/service_nav_path_inc.tpl
index 3c41c14..fd598d0 100644
--- a/templates/service_nav_path_inc.tpl
+++ b/templates/service_nav_path_inc.tpl
@@ -2,7 +2,11 @@
 {if $gBitSystem->isFeatureActive( 'pigeonholes_display_path' ) && $pigeonData}
 	<div class="structurebar pigeonholesbar">
 		{foreach from=$pigeonData item=pigeonItem}
-			<span class="path">{$pigeonItem.display_path}</span>
+			<span class="path">{$pigeonItem.display_path}
+				{if $gBitUser->hasPermission( 'p_pigeonholes_edit' )}
+					&nbsp;{smartlink ititle="Remove Category" ibiticon="icons/edit-delete" ipackage=pigeonholes ifile=edit_pigeonholes.php action=dismember parent_id=$pigeonItem.content_id pigeonhole_content_id=$gContent->mContentId return_uri=$gContent->getDisplayUri()}
+				{/if}
+			</span>
 		{/foreach}
 	</div><!-- end .structurebar -->
 {/if}