[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[46369] branches/11.x

[<jon...@us...>]

Revision: 46369
          http://sourceforge.net/p/tikiwiki/code/46369
Author:   jonnybradley
Date:     2013-06-16 14:48:16 +0000 (Sun, 16 Jun 2013)
Log Message:
-----------
[FIX] trackers: Respect some perms for editable items (modify_tracker_items etc and field perms so far)

Modified Paths:
--------------
    branches/11.x/templates/tiki-view_tracker.tpl
    branches/11.x/tiki-view_tracker.php

Modified: branches/11.x/templates/tiki-view_tracker.tpl
===================================================================
--- branches/11.x/templates/tiki-view_tracker.tpl	2013-06-16 14:16:09 UTC (rev 46368)
+++ branches/11.x/templates/tiki-view_tracker.tpl	2013-06-16 14:48:16 UTC (rev 46369)
@@ -153,10 +153,15 @@
 								{/if}
 								
 								{* ------- list values --- *}
+								{$ajaxedit = $prefs.ajax_inline_edit_trackerlist eq 'y' and
+										($tiki_p_modify_tracker_items eq 'y' and $items[user].status ne 'p' and $items[user].status ne 'c') or
+										($tiki_p_modify_tracker_items_pending eq 'y' and $items[user].status eq 'p') or
+										($tiki_p_modify_tracker_items_closed eq 'y' and $items[user].status eq 'c')
+								}
 								{foreach from=$items[user].field_values key=ix item=field_value}
 									{if $field_value.isTblVisible eq 'y' and $field_value.type ne 'x' and $field_value.type ne 'h' and ($field_value.type ne 'p' or $field_value.options_array[0] ne 'password')}
 										<td class={if $field_value.type eq 'n' or $field_value.type eq 'q' or $field_value.type eq 'b'}"numeric"{else}"auto"{/if}>
-											{trackeroutput field=$field_value showlinks=y showpopup="y" item=$items[user] list_mode=y inTable=formcolor reloff=$itemoff editable=($prefs.ajax_inline_edit_trackerlist == 'y') ? 'block' : ''}
+											{trackeroutput field=$field_value showlinks=y showpopup="y" item=$items[user] list_mode=y inTable=formcolor reloff=$itemoff editable=($ajaxedit and $listfields[$field_value.fieldId].editable) ? 'block' : ''}
 										</td>
 									{/if}
 								{/foreach}

Modified: branches/11.x/tiki-view_tracker.php
===================================================================
--- branches/11.x/tiki-view_tracker.php	2013-06-16 14:16:09 UTC (rev 46368)
+++ branches/11.x/tiki-view_tracker.php	2013-06-16 14:48:16 UTC (rev 46369)
@@ -240,6 +240,11 @@
 			$fields['data'][$i] = $current_field_ins;
 		}
 	}
+	if ($fieldIsEditable) {
+		$listfields[$fid]['editable'] = true;
+	} else {
+		$listfields[$fid]['editable'] = false;
+	}
 }
 
 // Collect information from the provided fields

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.