SCHEMA CHANGE: (minor) rename is_excluded to a more intuitive is_revoked for liberty_content_perms, also major update to hasUserPermission to get all permissions for the current user joined with perms for the current content. This should handle cases where non-default permissions is assigned, default permission is removed, and duplicate default permissions where one group's perm is revoked, but another is still permitted.

1 files changed, 3 insertions, 3 deletions

diff --git a/templates/content_permissions.tpl b/templates/content_permissions.tpl
index dc0c346..c4ae116 100644
--- a/templates/content_permissions.tpl
+++ b/templates/content_permissions.tpl
@@ -36,8 +36,8 @@
 									{assign var=icon value="icons/list-add"}                   {* custon permission icon *}
 									{assign var=action value="remove"}                         {* remove permission if we have a custom one *}
 								{/if}
-								{if $contentPerms.assigned.$groupId.$perm.is_excluded}
-									{assign var=icon value="icons/list-remove"}                {* is_excluded icon *}
+								{if $contentPerms.assigned.$groupId.$perm.is_revoked}
+									{assign var=icon value="icons/list-remove"}                {* is_revoked icon *}
 								{/if}
 							{/if}
 							<td style="text-align:center">{smartlink itra=false ititle=$perm ibiticon=$icon action=$action content_id=$gContent->mContentId perm=$perm group_id=$groupId}</td>
@@ -97,7 +97,7 @@
 									<td rowspan="{$smarty.foreach.fgroup.total}">{$permInfo.group_name}</td>
 								{/if}
 								<td>
-									{if $contentPerms.assigned.$groupId.$perm.is_excluded}
+									{if $contentPerms.assigned.$groupId.$perm.is_revoked}
 										{biticon iname=list-remove iexplain="Removed Permission"}
 									{else}
 										{biticon iname=list-add iexplain="Added Permission"}