lots of content permissions work. tentatively added updateUserPermissions() to service load function.

3 files changed, 103 insertions, 78 deletions

diff --git a/templates/content_permissions_inc.tpl b/templates/content_permissions_inc.tpl
index 70bd4e2..f90e1f2 100644
--- a/templates/content_permissions_inc.tpl
+++ b/templates/content_permissions_inc.tpl
@@ -1,75 +1,98 @@
+{strip}
 <h2>{tr}Assign permissions to{/tr}: {$gContent->getTitle()}</h2>
 
-{* you can't have a form within a form - services are inserted into forms - xing
-form legend="Content Permissions"*}
-	<input type="hidden" name="perm_content_id" value="{$gContent->mContentId}" />
+{if !$contentPerms.assigned}
+	{formhelp warning="No Individual permissions set. Global Permissions apply."}
+{/if}
 
-	<div class="row">
-		{formlabel label="Assign this Permission" for="perm"}
-		{forminput}
-			<select name="perm" id="perm">
-				{foreach from=$assignPerms item=perm}
-					<option value="{$perm.perm_name}">{$perm.perm_desc}</option>
-				{/foreach}
-			</select>
-			{formhelp note=""}
-		{/forminput}
-	</div>
+{if $contentPerms.groups|count > 10}
 
-	<div class="row">
-		{formlabel label="To this Group" for="group_id"}
-		{forminput}
-			<select name="perm_group_id" id="group_id">
-				{foreach from=$userGroups item=group}
-					<option value="{$group.group_id}">{$group.group_name}</option>
-				{/foreach}
-			</select>
-			{formhelp note=""}
-		{/forminput}
-	</div>
+	{foreach from=$contentPerms.groups item=group}
+		<h3>{tr}Permissions for{/tr}: {$group.group_name}</h3>
+		<table class="data">
+			<tr>
+				<th>{tr}Permission{/tr}</th>
+				<th>{tr}Status{/tr}</th>
+			</tr>
+			{foreach from=$contentPerms.assignable item=perm}
+				<tr>
+					<td>{$perm.perm_desc} <em>({$perm.perm_name})</em></td>
+					{assign var=icon value="icons/media-playback-stop"}
+					{assign var=action value="assign"}
+					{foreach from=$contentPerms.assigned item=ass}
+						{if $ass.group_id == $group.group_id and $ass.perm_name == $perm.perm_name}
+							{assign var=icon value="icons/dialog-ok"}
+							{assign var=action value="remove"}
+						{/if}
+					{/foreach}
+					<td style="text-align:center">{smartlink ititle=Allow ibiticon=$icon action=$action content_id=$gContent->mContentId perm=$perm.perm_name group_id=$group.group_id}</td>
+				</tr>
+			{/foreach}
+		</table>
+		<br /><hr /><br />
+	{/foreach}
 
-	<div class="row submit">
-		<input type="submit" name="back" value="{tr}Go back to content{/tr}" />
-		<input type="submit" name="assign" value="{tr}Assign Permission{/tr}" />
-	</div>
-{*/form*}
+{else}
 
-<br />
+	{form}
+		<input type="hidden" name="content_id" value="{$gContent->mContentId}" />
+		<input type="hidden" name="action" value="assign" />
 
-<table class="data">
-	<caption>{tr}Permissions assigned to this content{/tr}</caption>
-	<tr>
-		<th>{smartlink content_id=$gContent->mContentId ititle=Group isort=group_name idefault=1}</th>
-		<th>{smartlink content_id=$gContent->mContentId ititle=Permission isort=perm_name}</th>
-		<th>{tr}Action{/tr}</th>
-	</tr>
-	{foreach from=$assignedPerms item=perm}
-		<tr class="{cycle values="even,odd"}">
-			<td>{$perm.group_name}</td>
-			<td>
-				{$perm.perm_name}
-				<br />
-				{$perm.perm_desc}
-			</td>
-			<td align="right">
-				{smartlink ititle="Remove Permission" ibiticon="icons/edit-delete" action=remove perm_content_id=$gContent->mContentId perm=$perm.perm_name group_id=$perm.group_id}
-			</td>
-		</tr>
-	{foreachelse}
-		<tr class="norecords">
-			<td colspan="3">{tr}No individual permissions, global permissions apply{/tr}</td>
-		</tr>
-	{/foreach}
-</table>
+		<div class="row">
+			{formlabel label="Assign this Permission" for="perm"}
+			{forminput}
+				<select name="perm" id="perm">
+					{foreach from=$contentPerms.assignable item=perm}
+						<option value="{$perm.perm_name}">{$perm.perm_desc}</option>
+					{/foreach}
+				</select>
+				{formhelp note=""}
+			{/forminput}
+		</div>
+
+		<div class="row">
+			{formlabel label="To this Group" for="group_id"}
+			{forminput}
+				<select name="group_id" id="group_id">
+					{foreach from=$contentPerms.groups item=group}
+						<option value="{$group.group_id}">{$group.group_name}</option>
+					{/foreach}
+				</select>
+				{formhelp note=""}
+			{/forminput}
+		</div>
+
+		<div class="row submit">
+			<input type="submit" name="back" value="{tr}Go back to content{/tr}" />
+			<input type="submit" name="assign" value="{tr}Assign Permission{/tr}" />
+		</div>
+	{/form}
+
+	{if $contentPerms.assigned}
+		<br />
 
-{* probably not needed - xing
-<br /><hr /><br />
+		<table class="data">
+			<caption>{tr}Permissions assigned to this content{/tr}</caption>
+			<tr>
+				<th>{smartlink content_id=$gContent->mContentId ititle=Group isort=group_name idefault=1}</th>
+				<th>{smartlink content_id=$gContent->mContentId ititle=Permission isort=perm_name}</th>
+				<th>{tr}Action{/tr}</th>
+			</tr>
+			{foreach from=$contentPerms.assigned item=perm}
+				<tr class="{cycle values="even,odd"}">
+					<td>{$perm.group_name}</td>
+					<td>{$perm.perm_desc} <em>({$perm.perm_name})</em></td>
+					<td align="right">
+						{smartlink ititle="Remove Permission" ibiticon="icons/edit-delete" action=remove content_id=$gContent->mContentId perm=$perm.perm_name group_id=$perm.group_id}
+					</td>
+				</tr>
+			{foreachelse}
+				<tr class="norecords">
+					<td colspan="3">{tr}No individual permissions, global permissions apply{/tr}</td>
+				</tr>
+			{/foreach}
+		</table>
+	{/if}
 
-<h2>{tr}Permission explanation{/tr}</h2>
-{foreach from=$assignPerms item=perm}
-	<dl class="help">
-		<dt>{$perm.perm_name}</dt>
-		<dd>{$perm.perm_desc}</dd>
-	</dl>
-{/foreach}
-*}
+{/if}
+{/strip}
diff --git a/templates/service_content_edit_tab_inc.tpl b/templates/service_content_edit_tab_inc.tpl
index a177f30..7c7bb43 100644
--- a/templates/service_content_edit_tab_inc.tpl
+++ b/templates/service_content_edit_tab_inc.tpl
@@ -1,13 +1,5 @@
-
-{php}
-global $gContent;
-//vd( $gContent );
-{/php}
-
-{if $gBitUser->hasPermission('p_liberty_assign_content_perms')}
-{jstab title="Permissions"}
-
-{include file="bitpackage:liberty/content_permissions_inc.tpl"}
-
-{/jstab}
+{if $gBitUser->hasPermission( 'p_liberty_assign_content_perms' )}
+	{jstab title="Permissions"}
+		{include file="bitpackage:liberty/content_permissions_inc.tpl"}
+	{/jstab}
 {/if}
diff --git a/templates/service_content_icon_inc.tpl b/templates/service_content_icon_inc.tpl
index 83b072e..a99c121 100644
--- a/templates/service_content_icon_inc.tpl
+++ b/templates/service_content_icon_inc.tpl
@@ -1,3 +1,13 @@
+{strip}
 {if $gBitSystem->isFeatureActive( 'liberty_cache' ) && $gContent->isCached()}
 	<a title="{tr}Refresh cache{/tr}" href="{$gContent->getDisplayUrl()}&amp;refresh_liberty_cache={$gContent->mContentId}">{biticon ipackage="icons" iname="view-refresh" iexplain="Refresh cache"}</a>
 {/if}
+{if $gBitUser->hasPermission( 'p_liberty_assign_content_perms' ) and $serviceHash.content_id}
+	{if $gContent->mPerms} {* don't think there is a serviceHash way of working out if there are individual permissions set *}
+		{assign var=perm_icon value="icons/emblem-readonly"}
+	{else}
+		{assign var=perm_icon value="icons/emblem-shared"}
+	{/if}
+	{smartlink ipackage=liberty ifile=content_permissions.php ititle="Assign Permissions" ibiticon=$perm_icon ipackage=liberty ifile="content_permissions.php" content_id=$serviceHash.content_id}
+{/if}
+{/strip}