[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[33445] trunk

[<lph...@us...>]

Revision: 33445
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=33445&view=rev
Author:   lphuberdeau
Date:     2011-03-16 20:48:02 +0000 (Wed, 16 Mar 2011)

Log Message:
-----------
[MOD] Remove author field lookup from main loop, remove author group field (partial implementation)

Modified Paths:
--------------
    trunk/lib/trackers/trackerlib.php
    trunk/lib/wiki-plugins/wikiplugin_tracker.php
    trunk/templates/tracker_item_field_input.tpl
    trunk/tiki-view_tracker_item.php

Modified: trunk/lib/trackers/trackerlib.php
===================================================================
--- trunk/lib/trackers/trackerlib.php	2011-03-16 20:26:37 UTC (rev 33444)
+++ trunk/lib/trackers/trackerlib.php	2011-03-16 20:48:02 UTC (rev 33445)
@@ -5022,6 +5022,18 @@
 		}
 	}
 
+	function getAuthorField()
+	{
+		foreach ($this->getFields() as $field) {
+			if ($field['type'] == 'u'
+				&& isset($field['options'][0]) && $field['options'][0] == 1
+				&& isset($this->trackerInfo["writerCanModify"]) && $this->trackerInfo["writerCanModify"] == 'y') {
+
+				return $field['fieldId'];
+			}
+		}
+	}
+
 	function getWriterField()
 	{
 		foreach ($this->getFields() as $field) {

Modified: trunk/lib/wiki-plugins/wikiplugin_tracker.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_tracker.php	2011-03-16 20:26:37 UTC (rev 33444)
+++ trunk/lib/wiki-plugins/wikiplugin_tracker.php	2011-03-16 20:48:02 UTC (rev 33445)
@@ -1243,8 +1243,6 @@
 					$back.= '<input type="hidden" name="authorfieldid" value="'.$f['fieldId'].'" />';
 				} elseif ($f['type'] == 'I' and $f['options_array'][0] == '1') {
 					$back.= '<input type="hidden" name="authoripid" value="'.$f['fieldId'].'" />';
-				} elseif ($f['type'] == 'g' and $f['options_array'][0] == '1') {
-					$back.= '<input type="hidden" name="authorgroupfieldid" value="'.$f['fieldId'].'" />';
 				} elseif ($f['type'] == 'q') {
 					$back .= '<input type="hidden" name="track['.$f['fieldId'].']" />';
 				} elseif (in_array($f['fieldId'], $outf)) {

Modified: trunk/templates/tracker_item_field_input.tpl
===================================================================
--- trunk/templates/tracker_item_field_input.tpl	2011-03-16 20:26:37 UTC (rev 33444)
+++ trunk/templates/tracker_item_field_input.tpl	2011-03-16 20:48:02 UTC (rev 33445)
@@ -91,7 +91,6 @@
 	{elseif $field_value.options_array[0] eq 1}
 		{if empty($field_value.value)}
 			{$group|escape}
-			<input type="hidden" name="authorgroupfieldid" value="{$field_value.fieldId}" />
 		{else}
 			{$field_value.value|escape}
 		{/if}

Modified: trunk/tiki-view_tracker_item.php
===================================================================
--- trunk/tiki-view_tracker_item.php	2011-03-16 20:26:37 UTC (rev 33444)
+++ trunk/tiki-view_tracker_item.php	2011-03-16 20:48:02 UTC (rev 33445)
@@ -409,9 +409,6 @@
 				if ($current_field_fields['options_array'][0] == 2) {
 					$current_field_ins["value"] = $user;
 				} elseif ($current_field_fields['options_array'][0] == 1) {
-					if (isset($tracker_info["writerCanModify"]) and $tracker_info["writerCanModify"] == 'y') {
-						$tracker_info["authorfield"] = $fid;
-					}
 					if (isset($tracker_info['userCanTakeOwnership']) && $tracker_info['userCanTakeOwnership'] == 'y' && empty($current_field_ins['value'])) {
 						$current_field_ins['value'] = $user; // the user appropiate the item
 					} elseif ($tiki_p_admin_trackers != 'y') {
@@ -450,9 +447,6 @@
 				if ($current_field_fields['options_array'][0] == 2) {
 					$current_field_ins["value"] = $group;
 				} elseif ($current_field_fields['options_array'][0] == 1) {
-					if (isset($tracker_info["writerGroupCanModify"]) and $tracker_info["writerGroupCanModify"] == 'y') {
-						$tracker_info["authorgroupfield"] = $fid;
-					}
 					unset($current_field_ins["fieldId"]);
 				} else {
 					$current_field_ins["value"] = '';
@@ -478,12 +472,6 @@
 				$current_field_fields["value"] = '';
 			}
 		}
-	} elseif ($current_field["type"] == "u" and isset($current_field['options_array'][0]) and $user and $current_field['options_array'][0] == 1 and isset($tracker_info["writerCanModify"]) and $tracker_info["writerCanModify"] == 'y') {
-		// even if field is hidden need to pick up user for perm
-		$tracker_info["authorfield"] = $fid;
-	} elseif ($current_field["type"] == "g" and isset($current_field['options_array'][0]) and $group and $current_field['options_array'][0] == 1 and isset($tracker_info["writerGroupCanModify"]) and $tracker_info["writerGroupCanModify"] == 'y') {
-		// even if field hidden need to pick up the group for perm
-		$tracker_info["authorgroupfield"] = $fid;
 	}
 
 	if (! empty($current_field_ins)) {
@@ -503,8 +491,9 @@
 	}
 }
 
-if (isset($tracker_info["authorfield"])) {
-	$tracker_info['authorindiv'] = $trklib->get_item_value($_REQUEST["trackerId"], $_REQUEST["itemId"], $tracker_info["authorfield"]);
+$authorfield = $definition->getAuthorField();
+if ($authorfield) {
+	$tracker_info['authorindiv'] = $trklib->get_item_value($_REQUEST["trackerId"], $_REQUEST["itemId"], $authorfield);
 	if (($user && $tracker_info['authorindiv'] == $user) or ($user && $tracker_info['userCanTakeOwnership'] == 'y' && empty($tracker_info['authorindiv']))) {
 		$tiki_p_modify_tracker_items = 'y';
 		$smarty->assign("tiki_p_modify_tracker_items", "y");


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