BIG CHANGE: migrate p_*_edit permissions to p_*_update permission naming convention, hasEditPermission is now hasUpdatePermission, many explicit perm checks have been cleaned up to hasUpdatePermission

4 files changed, 7 insertions, 7 deletions

diff --git a/templates/list.tpl b/templates/list.tpl
index b5ec031..4bf55e4 100644
--- a/templates/list.tpl
+++ b/templates/list.tpl
@@ -27,7 +27,7 @@
 		<h1>{tr}Categories{/tr} <span class="total">[ {$listInfo.total_records|default:0} ]</span></h1>
 
 		{foreach from=$pigeonList item=item}
-			{if $gBitUser->hasPermission( 'p_pigeonholes_edit' )}
+			{if $gBitUser->hasPermission( 'p_pigeonholes_update' )}
 				<div class="floaticon">
 					{smartlink ititle="Change Structure" ifile="edit_structure.php" ibiticon="icons/view-refresh" structure_id=`$item.structure_id`}
 					{smartlink ititle="Insert new Category" ifile="edit_pigeonholes.php" ibiticon="icons/document-new" structure_id=`$item.structure_id` action=create}
diff --git a/templates/menu_pigeonholes.tpl b/templates/menu_pigeonholes.tpl
index e1687df..1b3150f 100644
--- a/templates/menu_pigeonholes.tpl
+++ b/templates/menu_pigeonholes.tpl
@@ -1,6 +1,6 @@
 {strip}
 <ul>
-	{if $gBitUser->hasPermission( 'p_pigeonholes_edit' )}
+	{if $gBitUser->hasPermission( 'p_pigeonholes_create' )}
 		<li><a class="item" href="{$smarty.const.PIGEONHOLES_PKG_URL}edit_pigeonholes.php?action=create">{biticon iname="document-new" iexplain="Create Category" ilocation=menu}</a></li>
 	{/if}
 
@@ -8,7 +8,7 @@
 		<li><a class="item" href="{$smarty.const.PIGEONHOLES_PKG_URL}list.php">{biticon iname="format-justify-fill" iexplain="List Categories" ilocation=menu}</a></li>
 		{if $gContent->mStructureId and $gContent->mType.content_type_guid == $smarty.const.PIGEONHOLES_CONTENT_TYPE_GUID}
 		<li><a class="item" href="{$smarty.const.PIGEONHOLES_PKG_URL}{if $gBitSystem->isFeatureActive('pretty_urls_extended')}view/structure/{else}view.php?structure_id={/if}{$gContent->mStructureId}">{biticon iname=edit-find iexplain="View Category" ilocation=menu}</a></li>
-			{if $gBitUser->hasPermission( 'p_pigeonholes_edit' )}
+			{if $gBitUser->hasCreatePermission()}
 				<li><a class="head" href="{$smarty.const.PIGEONHOLES_PKG_URL}edit_pigeonholes.php?structure_id={$gContent->getField('structure_id')}&amp;action=edit">{biticon iname="accessories-text-editor" iexplain="Edit Category" ilocation=menu}</a></li>
 				<li><a class="item" href="{$smarty.const.PIGEONHOLES_PKG_URL}edit_pigeonholes.php?structure_id={$gContent->getField('root_structure_id')}&amp;action=create">{biticon iname="insert-object" iexplain="Insert Sub-Category" ilocation=menu}</a></li>
 				<li><a class="item" href="{$smarty.const.PIGEONHOLES_PKG_URL}edit_structure.php?structure_id={$gContent->getField('structure_id')}">{biticon iname="view-refresh" iexplain="Change Structure" ilocation=menu}</a></li>
@@ -17,7 +17,7 @@
 		{/if}
 	{/if}
 
-	{if $gBitUser->hasPermission( 'p_pigeonholes_edit' )}
+	{if $gBitUser->hasPermission( 'p_pigeonholes_insert_member' )}
 		<li><a class="item" href="{$smarty.const.PIGEONHOLES_PKG_URL}assign_content.php">{biticon iname="mail-attachment" iexplain="Assign Content" ilocation=menu}</a></li>
 	{/if}
 </ul>
diff --git a/templates/section_inc.tpl b/templates/section_inc.tpl
index 88e2092..83ecb1c 100644
--- a/templates/section_inc.tpl
+++ b/templates/section_inc.tpl
@@ -35,7 +35,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' )}
+					{if $gBitUser->hasPermission( 'p_pigeonholes_insert_member' )}
 						&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>
@@ -55,7 +55,7 @@
 {else}
 
 	{* ======= very basic display of the pigoenhole structure ======= *}
-	{if !$no_edit  and $gBitUser->hasPermission( 'p_pigeonholes_edit' )}
+	{if !$no_edit  and $gBitUser->hasPermission( 'p_pigeonholes_update' )}
 		<div class="floaticon">
 			{smartlink ititle="Insert new Category" ifile="edit_pigeonholes.php" ibiticon="icons/document-new" structure_id=`$subtree[ix].structure_id` action=create}
 			{smartlink ititle="Edit Category" ibiticon="icons/accessories-text-editor" ifile="edit_pigeonholes.php" structure_id=$subtree[ix].structure_id action=edit}
diff --git a/templates/service_nav_path_inc.tpl b/templates/service_nav_path_inc.tpl
index fd598d0..16b5e5d 100644
--- a/templates/service_nav_path_inc.tpl
+++ b/templates/service_nav_path_inc.tpl
@@ -3,7 +3,7 @@
 	<div class="structurebar pigeonholesbar">
 		{foreach from=$pigeonData item=pigeonItem}
 			<span class="path">{$pigeonItem.display_path}
-				{if $gBitUser->hasPermission( 'p_pigeonholes_edit' )}
+				{if $gContent->hasEditPermission()}
 					&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>