[evolvis-commits] r18233: update to tip of integration branch

mirabilos at evolvis.org mirabilos at evolvis.org
Thu Apr 5 17:44:22 CEST 2012


Author: mirabilos
Date: 2012-04-05 17:44:19 +0200 (Thu, 05 Apr 2012)
New Revision: 18233

Modified:
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/Makefile
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/tracker/Artifact.class.php
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/tracker/ArtifactExtraField.class.php
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/tracker/artifact_type_definitions.php
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/debian/changelog
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/debian/evolvis.postinst
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/translations/de.po
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/translations/fusionforge.pot
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/tracker/include/ArtifactTypeHtml.class.php
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/tracker/item.php
Log:
update to tip of integration branch

Modified: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/Makefile
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/Makefile	2012-04-05 10:25:42 UTC (rev 18232)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/Makefile	2012-04-05 15:44:19 UTC (rev 18233)
@@ -1,5 +1,5 @@
 regress:
-	# moreutils phpunit pcregrep
+	#       phpunit             pcregrep                     moreutils
 	test -x /usr/bin/phpunit && test -x /usr/bin/pcregrep && test -x /usr/bin/isutf8
 	php mvntests/AllTests.php
 	@echo minimal testsuite run.

Modified: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/tracker/Artifact.class.php
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/tracker/Artifact.class.php	2012-04-05 10:25:42 UTC (rev 18232)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/tracker/Artifact.class.php	2012-04-05 15:44:19 UTC (rev 18233)
@@ -1208,15 +1208,16 @@
 				skip it and continue to next item
 
 */
-		if (empty($extra_fields)) {
-			return true;
-		}
 		$update = false;
 
 		//get a list of extra fields for this artifact_type
 		$ef = $this->ArtifactType->getExtraFields();
 		$efk=array_keys($ef);
 
+		if (empty($extra_fields) && empty($ef)) {
+			return true;
+		}
+
 		// If there is a status field, then check against the workflow.
 		for ($i=0; $i<count($efk); $i++) {
 			$efid=$efk[$i];

Modified: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/tracker/ArtifactExtraField.class.php
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/tracker/ArtifactExtraField.class.php	2012-04-05 10:25:42 UTC (rev 18232)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/tracker/ArtifactExtraField.class.php	2012-04-05 15:44:19 UTC (rev 18233)
@@ -121,7 +121,7 @@
 					array($name,
 					      $this->ArtifactType->getID()));
 		if (db_numrows($res) > 0) {
-			$this->setError(_('Field name already exists'));
+			$this->setError(sprintf(_('Field name "%s" already exists'), $name));
 			return false;
 		}
 		if ($field_type == ARTIFACT_EXTRAFIELDTYPE_TEXT || $field_type == ARTIFACT_EXTRAFIELDTYPE_INTEGER) {
@@ -384,7 +384,7 @@
 				$this->ArtifactType->getID(),
 				$this->getID()));
 		if (db_numrows($res) > 0) {
-			$this->setError(_('Field name already exists'));
+			$this->setError(sprintf(_('Field name "%s" already exists'), $name));
 			return false;
 		}
 		if ($is_required) {

Modified: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/tracker/artifact_type_definitions.php
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/tracker/artifact_type_definitions.php	2012-04-05 10:25:42 UTC (rev 18232)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/tracker/artifact_type_definitions.php	2012-04-05 15:44:19 UTC (rev 18233)
@@ -3,7 +3,7 @@
  * FusionForge trackers
  *
  * Copyright 2005, GForge, LLC
- * Copyright © 2011
+ * Copyright © 2011, 2012
  *	Thorsten Glaser <t.glaser at tarent.de>
  *
  * This file is part of FusionForge. FusionForge is free software;
@@ -170,18 +170,18 @@
 );
 
 $resolutions = array(
-	'Accepted As Bug',
-	'Fixed',
-	'Won\'t Fix',
-	'Invalid',
-	'Awaiting Response',
-	'Works for me',
-	'Duplicate',
-	'Reopen',
-	'New',
-	'Spec out of Date',
-	'PM-Verified',
-	'QA-Verified',
+	array('New', 1),
+	array('Accepted As Bug', 1),
+	array('Fixed', 2),
+	array('Won\'t Fix', 2),
+	array('Invalid', 3),
+	array('Awaiting Response', 1),	/* should be PENDING not OPEN */
+	array('Works for me', 2),
+	array('Duplicate', 2),
+	array('Reopen', 1),
+	array('Spec out of Date', 1),
+	array('PM-Verified', 1),
+	array('QA-Verified', 2),
 );
 
 
@@ -198,7 +198,7 @@
 $browser=array('Browser',ARTIFACT_EXTRAFIELDTYPE_TEXT,40,100,0,array());
 $verfound=array('Version Found',ARTIFACT_EXTRAFIELDTYPE_TEXT,20,64,0,array());
 $verfixed=array('Version Fixed',ARTIFACT_EXTRAFIELDTYPE_TEXT,20,64,0,array());
-$resolution=array('Resolution',ARTIFACT_EXTRAFIELDTYPE_SELECT,0,0,0,$resolutions);
+$resolution=array('Resolution',ARTIFACT_EXTRAFIELDTYPE_STATUS,0,0,1,$resolutions);
 $severity=array('Severity',ARTIFACT_EXTRAFIELDTYPE_SELECT,0,0,0,$severities);
 
 //
@@ -222,65 +222,17 @@
 	$resolution,
 	$severity,
 );
-$evolvis_renderer = '
-	<!-- Start Extra Fields Rendering (Evolvis Template: Bugs) -->
-	<!-- COLUMN NAMES MUST BE PRESERVED EXACTLY, INCLUDING CASE! -->
-	<tr>
-		<td width="50%" valign="top"><strong>Severity:<br /></strong><!--Severity--></td>
-		<td width="50%" valign="top"><strong>Resolution:<br /></strong><!--Resolution--></td>
-	</tr>
-	<tr>
-		<td width="50%" valign="top"><strong>Operating System:<br /></strong><!--Operating System--></td>
-		<td width="50%" valign="top"><strong>Browser</strong>:<br /><!--Browser--></td>
-	</tr>
-	<tr>
-		<td width="50%" valign="top"><strong>URL</strong>:<br /><!--URL--></td>
-		<td width="50%" valign="top"><strong>Component</strong>:<br /><!--Component--></td>
-	</tr>
-	<tr>
-		<td width="50%" valign="top"><strong>Version Found</strong>:<br /><!--Version Found--></td>
-		<td width="50%" valign="top"><strong>Version Fixed</strong>:<br /><!--Version Fixed--></td>
-	</tr>
-	<!-- End Extra Fields Rendering (Evolvis Template) -->
-';
+$evolvis_renderer = '';
 
 $trackers[]=array('Bugs','Bug Tracking System',1,0,'','',30,0,'','',1, $evolvis_fields, $evolvis_renderer);
 
 $trackers[]=array('Support','Tech Support Tracking System',1,0,'','',30,0,'','',2, $evolvis_fields, $evolvis_renderer);
 
 $trackers[]=array('Patches','Patch Tracking System',1,0,'','',30,0,'','',3,
-	array($component, $verfound, $verfixed, $resolution, $severity, $url), '
-	<!-- Start Extra Fields Rendering (Evolvis Template: Patches) -->
-	<!-- COLUMN NAMES MUST BE PRESERVED EXACTLY, INCLUDING CASE! -->
-	<tr>
-		<td width="50%" valign="top"><strong>Severity:<br /></strong><!--Severity--></td>
-		<td width="50%" valign="top"><strong>Resolution:<br /></strong><!--Resolution--></td>
-	</tr>
-	<tr>
-		<td width="50%" valign="top"><strong>URL</strong>:<br /><!--URL--></td>
-		<td width="50%" valign="top"><strong>Component</strong>:<br /><!--Component--></td>
-	</tr>
-	<tr>
-		<td width="50%" valign="top"><strong>Version Found</strong>:<br /><!--Version Found--></td>
-		<td width="50%" valign="top"><strong>Version Fixed</strong>:<br /><!--Version Fixed--></td>
-	</tr>
-	<!-- End Extra Fields Rendering (Evolvis Template) -->
-');
+	array($component, $verfound, $verfixed, $resolution, $severity, $url), '');
 
 $trackers[]=array('Feature Requests','Feature Request Tracking System',1,0,'','',30,0,'','',4,
-	array($url, $component, $browser, $os), '
-	<!-- Start Extra Fields Rendering (Evolvis Template: FRs) -->
-	<!-- COLUMN NAMES MUST BE PRESERVED EXACTLY, INCLUDING CASE! -->
-	<tr>
-		<td width="50%" valign="top"><strong>Operating System:<br /></strong><!--Operating System--></td>
-		<td width="50%" valign="top"><strong>Browser</strong>:<br /><!--Browser--></td>
-	</tr>
-	<tr>
-		<td width="50%" valign="top"><strong>URL</strong>:<br /><!--URL--></td>
-		<td width="50%" valign="top"><strong>Component</strong>:<br /><!--Component--></td>
-	</tr>
-	<!-- End Extra Fields Rendering (Evolvis Template) -->
-');
+	array($url, $component, $browser, $os), '');
 
 
 /* Funktionsreferenz: https://evolvis.org/tracker/t_follow.php/1073 */
@@ -335,37 +287,9 @@
 		array('abgenommen', 2),
 		array('gelöscht', 3),
 	    )),
-    ), '
-	<!-- Start Extra Fields Rendering (Evolvis Template: Funktionsreferenz) -->
-	<!-- COLUMN NAMES MUST BE PRESERVED EXACTLY, INCLUDING CASE! -->
-	<tr>
-		<td width="50%" valign="top"><strong>Anforderungstyp:<br /></strong><!--Anforderungstyp--></td>
-		<td width="50%" valign="top"><strong>Spezifikationsreferenz</strong>:<br /><!--Spezifikationsreferenz--></td>
-	</tr><tr>
-		<td width="50%" valign="top"><strong>Kundenwert</strong>:<br /><!--Kundenwert--></td>
-		<td width="50%" valign="top"><strong>Zielversion:<br /></strong><!--Zielversion--></td>
-	</tr><tr>
-		<td width="50%" valign="top"><strong>Komplexität</strong>:<br /><!--Komplexität--></td>
-		<td width="50%" valign="top"><strong>Meilenstein:<br /></strong><!--Meilenstein--></td>
-	</tr><tr>
-		<td width="50%" valign="top"><strong>Kategorie/Komponente:<br /></strong><!--Kategorie/Komponente--></td>
-		<td width="50%" valign="top"><strong>Abschlußsprint:<br /></strong><!--Abschlußsprint--></td>
-	</tr><tr>
-		<td width="50%" valign="top"><strong>Funktionsgruppe:<br /></strong><!--Funktionsgruppe--></td>
-		<td width="50%" valign="top"><strong>Fortschritt:<br /></strong><!--Fortschritt--></td>
-	</tr><tr>
-		<td width="50%" valign="top"><table>
-			<tr><td valign="top"><strong>Status</strong>:</td><td><!--Status--></td></tr>
-			<tr><td valign="bottom"><strong>URL</strong>:</td><td><!--URL--></td></tr>
-		</table></td>
-		<td width="50%" valign="top"><strong>Freigabe:<br /></strong><!--Freigabe--></td>
-	</tr>
-	<!-- End Extra Fields Rendering (Evolvis Template) -->
-');
+    ), '');
 
 // Local Variables:
 // mode: php
 // c-file-style: "bsd"
 // End:
-
-?>

Modified: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/debian/changelog
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/debian/changelog	2012-04-05 10:25:42 UTC (rev 18232)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/debian/changelog	2012-04-05 15:44:19 UTC (rev 18233)
@@ -1,3 +1,15 @@
+fusionforge (5.1.1+evolvis51) unstable; urgency=low
+
+  [ Roland Mas ]
+  * [#2957] Fix custom fields not being initialised on move across trackers
+
+  [ Thorsten Glaser ]
+  * Make “Resolution” into a Status custom field, to be able to define
+    workflows, use the bargraph, and do better statistics e.g. in R
+  * Avoid rendering the Status field twice if custom and called Resolution
+
+ -- Thorsten Glaser <t.glaser at tarent.de>  Thu, 05 Apr 2012 16:29:30 +0200
+
 fusionforge (5.1.1+evolvis50) unstable; urgency=low
 
   [ Julien Heyman ]

Modified: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/debian/evolvis.postinst
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/debian/evolvis.postinst	2012-04-05 10:25:42 UTC (rev 18232)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/debian/evolvis.postinst	2012-04-05 15:44:19 UTC (rev 18233)
@@ -38,11 +38,11 @@
 	fi
 
 	if test -z "$2" || \
-	    dpkg --compare-versions "$2" lt 5.1.1+evolvis7.2; then
-		# fresh installation or upgrade from <= evolvis 7.2 (beta)
-		# => create a template project for evolvis 8 (beta)
+	    dpkg --compare-versions "$2" lt 5.1.1+evolvis51; then
+		# fresh installation or upgrade from <= evolvis 51
+		# => create a template project for evolvis 51
 		/usr/share/gforge/bin/populate_template_project.php \
-		    new evtemplate8 'Evolvis Template v8'
+		    new evtemplate51 'Evolvis Template v51'
 	fi
 	;;
 

Modified: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/translations/de.po
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/translations/de.po	2012-04-05 10:25:42 UTC (rev 18232)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/translations/de.po	2012-04-05 15:44:19 UTC (rev 18233)
@@ -1,10 +1,10 @@
 # German translations for Evolvis.
 msgid ""
 msgstr ""
-"Project-Id-Version: EvolvisForge 5.1+evolvis50\n"
+"Project-Id-Version: EvolvisForge 5.1+evolvis51\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-03 15:51+0200\n"
-"PO-Revision-Date: 2012-04-03 15:54+0200\n"
+"POT-Creation-Date: 2012-04-05 16:29+0200\n"
+"PO-Revision-Date: 2012-04-05 16:01+0200\n"
 "Last-Translator: Thorsten Glaser <t.glaser at tarent.de>\n"
 "Language-Team: german\n"
 "Language: de\n"
@@ -383,8 +383,8 @@
 #: common/docman/views/listfile.php:204 common/docman/views/listfile.php:206
 #: common/forum/ForumHTML.class.php:65 common/forum/ForumHTML.class.php:222
 #: common/forum/ForumHTML.class.php:463 common/include/descriptive.php:133
-#: common/pm/ProjectTask.class.php:1226 common/tracker/Artifact.class.php:1518
-#: common/tracker/Artifact.class.php:1610
+#: common/pm/ProjectTask.class.php:1226 common/tracker/Artifact.class.php:1519
+#: common/tracker/Artifact.class.php:1611
 #: common/widget/Widget_MyLatestSvnCommits.class.php:65
 #: common/widget/Widget_ProjectInfo.class.php:66
 #: common/widget/Widget_Rss.class.php:74
@@ -422,10 +422,10 @@
 #: www/tracker/downloadcsv.php:65
 #: www/tracker/include/ArtifactHtml.class.php:60
 #: www/tracker/include/ArtifactHtml.class.php:69
-#: www/tracker/include/ArtifactTypeHtml.class.php:160
-#: www/tracker/include/ArtifactTypeHtml.class.php:161
-#: www/tracker/include/ArtifactTypeHtml.class.php:223 www/tracker/item.php:193
-#: www/tracker/item.php:198
+#: www/tracker/include/ArtifactTypeHtml.class.php:162
+#: www/tracker/include/ArtifactTypeHtml.class.php:163
+#: www/tracker/include/ArtifactTypeHtml.class.php:225 www/tracker/item.php:198
+#: www/tracker/item.php:203
 msgid "Y-m-d H:i"
 msgstr "d.m.Y H:i"
 
@@ -805,13 +805,13 @@
 #: www/tracker/admin/form-addextrafield.php:132
 #: www/tracker/admin/form-addextrafieldoption.php:101
 #: www/tracker/admin/form-updateextrafieldelement.php:60
-#: www/tracker/include/ArtifactTypeHtml.class.php:147 www/tracker/item.php:140
+#: www/tracker/include/ArtifactTypeHtml.class.php:149 www/tracker/item.php:141
 msgid "Status"
 msgstr "Status"
 
 #: common/docman/views/listfile.php:121 www/frs/index.php:183
 #: www/pm/ganttpage.php:160 www/project/admin/editimages.php:269
-#: www/tracker/include/ArtifactTypeHtml.class.php:203
+#: www/tracker/include/ArtifactTypeHtml.class.php:205
 msgid "Size"
 msgstr "Größe"
 
@@ -920,8 +920,8 @@
 #: common/include/rbac_texts.php:219
 #: common/widget/Widget_MyProjects.class.php:79
 #: plugins/mantisbt/www/index.php:49 www/include/Layout.class.php:694
-#: www/tracker/admin/ind.php:90 www/tracker/item.php:173
-#: www/tracker/item.php:392
+#: www/tracker/admin/ind.php:90 www/tracker/item.php:178
+#: www/tracker/item.php:397
 msgid "Admin"
 msgstr "Verwalten"
 
@@ -982,7 +982,7 @@
 #: www/tracker/admin/form-deletetracker.php:34
 #: www/tracker/admin/tracker.php:66 www/tracker/browse.php:176
 #: www/tracker/browse.php:503 www/tracker/deleteartifact.php:38
-#: www/tracker/item.php:256
+#: www/tracker/item.php:261
 msgid "Delete"
 msgstr "Löschen"
 
@@ -1285,7 +1285,7 @@
 #: www/search/include/renderers/TrackersHtmlSearchRenderer.class.php:51
 #: www/stats/lastlogins.php:50 www/stats/users_graph.php:85
 #: www/stats/views_graph.php:105 www/tracker/include/ArtifactHtml.class.php:46
-#: www/tracker/include/ArtifactTypeHtml.class.php:201
+#: www/tracker/include/ArtifactTypeHtml.class.php:203
 msgid "Date"
 msgstr "Datum"
 
@@ -1298,7 +1298,7 @@
 #: www/search/include/renderers/TasksHtmlSearchRenderer.class.php:49
 #: www/search/include/renderers/TrackersHtmlSearchRenderer.class.php:49
 #: www/tracker/admin/form-customizelist.php:42 www/tracker/browse.php:281
-#: www/tracker/browse.php:673 www/tracker/item.php:313
+#: www/tracker/browse.php:673 www/tracker/item.php:318
 #: www/tracker/query.php:199 www/tracker/query.php:383
 msgid "Summary"
 msgstr "Kurzbeschreibung"
@@ -1343,7 +1343,7 @@
 #: www/scm/include/scm_utils.php:90 www/survey/include/SurveyHTML.class.php:65
 #: www/survey/include/SurveyHTML.class.php:90 www/tracker/admin/tracker.php:28
 #: www/tracker/include/ArtifactTypeFactoryHtml.class.php:52
-#: www/tracker/include/ArtifactTypeHtml.class.php:799 www/tracker/ind.php:44
+#: www/tracker/include/ArtifactTypeHtml.class.php:801 www/tracker/ind.php:44
 msgid "Administration"
 msgstr "Administration"
 
@@ -2290,7 +2290,7 @@
 #: www/pm/include/ProjectGroupHTML.class.php:105
 #: www/scm/include/scm_utils.php:86
 #: www/tracker/include/ArtifactTypeFactoryHtml.class.php:48
-#: www/tracker/include/ArtifactTypeHtml.class.php:774
+#: www/tracker/include/ArtifactTypeHtml.class.php:776
 msgid "Reporting"
 msgstr "Auswertung"
 
@@ -3345,9 +3345,9 @@
 #: www/include/html.php:422 www/include/html.php:514 www/include/html.php:531
 #: www/include/html.php:565 www/include/html.php:606 www/include/html.php:645
 #: www/pm/ganttpage.php:62 www/tracker/include/ArtifactHtml.class.php:64
-#: www/tracker/include/ArtifactTypeHtml.class.php:428
-#: www/tracker/include/ArtifactTypeHtml.class.php:489
-#: www/tracker/include/ArtifactTypeHtml.class.php:721
+#: www/tracker/include/ArtifactTypeHtml.class.php:430
+#: www/tracker/include/ArtifactTypeHtml.class.php:491
+#: www/tracker/include/ArtifactTypeHtml.class.php:723
 msgid "None"
 msgstr "Keine"
 
@@ -3872,9 +3872,9 @@
 
 #: common/tracker/ArtifactExtraField.class.php:124
 #: common/tracker/ArtifactExtraField.class.php:387
-#, fuzzy
-msgid "Field name already exists"
-msgstr "Dieser Benutzername existiert bereits."
+#, php-format
+msgid "Field name \"%s\" already exists"
+msgstr "Feldname \"%s\" existiert bereits"
 
 #: common/tracker/ArtifactExtraField.class.php:186
 #: common/tracker/ArtifactExtraField.class.php:192
@@ -4460,7 +4460,7 @@
 msgstr "Anmerkungen"
 
 #: common/widget/Widget_ProjectLatestFileReleases.class.php:64
-#: www/tracker/include/ArtifactTypeHtml.class.php:789 www/tracker/item.php:240
+#: www/tracker/include/ArtifactTypeHtml.class.php:791 www/tracker/item.php:245
 msgid "Monitor"
 msgstr "Beobachte"
 
@@ -4859,7 +4859,7 @@
 #: plugins/scmsvn/common/SVNPlugin.class.php:192 www/admin/useredit.php:234
 #: www/project/admin/editimages.php:267 www/reporting/usersummary.php:101
 #: www/search/include/renderers/SkillHtmlSearchRenderer.class.php:44
-#: www/sendmessage.php:69 www/tracker/include/ArtifactTypeHtml.class.php:200
+#: www/sendmessage.php:69 www/tracker/include/ArtifactTypeHtml.class.php:202
 msgid "Name"
 msgstr "Name"
 
@@ -8187,7 +8187,7 @@
 "Mounten Sie die VOB entweder mit einem <tt>Cleartool Mount%1$s</tt> oder "
 "wählen Sie die <tt>%1$s</tt> VOB in Ihrem ClearCase Explorer."
 
-#: plugins/scmccase/common/CCasePlugin.class.php:111 www/tracker/item.php:448
+#: plugins/scmccase/common/CCasePlugin.class.php:111 www/tracker/item.php:453
 msgid "History"
 msgstr "Verlauf"
 
@@ -9793,7 +9793,7 @@
 #: www/activity/index.php:244 www/pm/include/ProjectTaskHTML.class.php:154
 #: www/project/admin/project_admin_utils.php:147
 #: www/tracker/include/ArtifactHtml.class.php:47
-#: www/tracker/include/ArtifactTypeHtml.class.php:202
+#: www/tracker/include/ArtifactTypeHtml.class.php:204
 msgid "By"
 msgstr "Von"
 
@@ -10677,7 +10677,7 @@
 #: www/news/admin/index.php:133 www/pm/templates/detail_template.php:64
 #: www/search/include/renderers/ArtifactHtmlSearchRenderer.class.php:57
 #: www/search/include/renderers/TrackersHtmlSearchRenderer.class.php:50
-#: www/tracker/browse.php:698 www/tracker/item.php:201
+#: www/tracker/browse.php:698 www/tracker/item.php:206
 msgid "Submitted by"
 msgstr "Gepostet von"
 
@@ -11758,7 +11758,7 @@
 
 #: www/forum/attachment.php:42 www/forum/attachment.php:126
 #: www/forum/attachment.php:154
-#: www/tracker/include/ArtifactTypeHtml.class.php:196
+#: www/tracker/include/ArtifactTypeHtml.class.php:198
 msgid "Attachments"
 msgstr "Anhänge"
 
@@ -13601,14 +13601,14 @@
 #: www/pm/include/pm_columns.php:37 www/pm/templates/detail_template.php:20
 #: www/tracker/admin/form-customizelist.php:45 www/tracker/browse.php:280
 #: www/tracker/browse.php:691 www/tracker/browse.php:883
-#: www/tracker/item.php:153 www/tracker/query.php:198
+#: www/tracker/item.php:156 www/tracker/query.php:198
 msgid "Priority"
 msgstr "Priorität"
 
 #: www/my/dashboard.php:71 www/pm/browse_task.php:411
 #: www/pm/browse_task.php:617 www/pm/templates/detail_template.php:30
 #: www/tracker/browse.php:694 www/tracker/browse.php:886
-#: www/tracker/item.php:167
+#: www/tracker/item.php:172
 msgid "Assigned to"
 msgstr "Zugewiesen an"
 
@@ -14409,7 +14409,7 @@
 #: www/pm/browse_task.php:401 www/pm/ganttpage.php:70
 #: www/pm/include/pm_columns.php:32 www/pm/templates/detail_template.php:42
 #: www/search/include/renderers/TasksHtmlSearchRenderer.class.php:50
-#: www/tracker/include/ArtifactTypeHtml.class.php:145
+#: www/tracker/include/ArtifactTypeHtml.class.php:147
 msgid "Start Date"
 msgstr "Startdatum"
 
@@ -14419,7 +14419,7 @@
 #: www/pm/include/pm_columns.php:33 www/pm/templates/detail_template.php:47
 #: www/reporting/usersummary.php:106
 #: www/search/include/renderers/TasksHtmlSearchRenderer.class.php:51
-#: www/tracker/include/ArtifactTypeHtml.class.php:146
+#: www/tracker/include/ArtifactTypeHtml.class.php:148
 msgid "End Date"
 msgstr "Enddatum"
 
@@ -14840,7 +14840,7 @@
 #: www/pm/browse_task.php:215 www/pm/browse_task.php:399
 #: www/pm/ganttpage.php:69 www/pm/include/ProjectTaskHTML.class.php:84
 #: www/pm/templates/detail_template.php:99
-#: www/tracker/include/ArtifactTypeHtml.class.php:144
+#: www/tracker/include/ArtifactTypeHtml.class.php:146
 msgid "Task Summary"
 msgstr "Zusammenfassung der Aufgabe"
 
@@ -15490,7 +15490,7 @@
 msgid "Task Successfully Deleted"
 msgstr "Aufgabe erfolgreich gelöscht"
 
-#: www/pm/templates/detail_template.php:69 www/tracker/item.php:227
+#: www/pm/templates/detail_template.php:69 www/tracker/item.php:232
 msgid "Permalink"
 msgstr "Permalink"
 
@@ -19038,7 +19038,7 @@
 msgstr "Außerstande ein ArtifactCanned Objekt anzulegen"
 
 #: www/tracker/admin/form-clonetracker.php:48
-#: www/tracker/include/ArtifactTypeHtml.class.php:835
+#: www/tracker/include/ArtifactTypeHtml.class.php:837
 msgid "Clone Tracker"
 msgstr "Tracker-Vorlage klonen"
 
@@ -19090,8 +19090,8 @@
 msgid "Close Date"
 msgstr "Schließdatum"
 
-#: www/tracker/admin/form-customizelist.php:49 www/tracker/item.php:330
-#: www/tracker/item.php:341 www/tracker/query.php:385
+#: www/tracker/admin/form-customizelist.php:49 www/tracker/item.php:335
+#: www/tracker/item.php:346 www/tracker/query.php:385
 msgid "Detailed description"
 msgstr "Genaue Beschreibung"
 
@@ -19401,7 +19401,7 @@
 msgstr "Erfolgreich gelöscht."
 
 #: www/tracker/admin/tracker.php:31
-#: www/tracker/include/ArtifactTypeHtml.class.php:744
+#: www/tracker/include/ArtifactTypeHtml.class.php:746
 msgid "New Tracker"
 msgstr "Neuer Tracker"
 
@@ -19411,7 +19411,7 @@
 msgstr "Standardwert für neue Tracker"
 
 #: www/tracker/admin/tracker.php:36
-#: www/tracker/include/ArtifactTypeHtml.class.php:810
+#: www/tracker/include/ArtifactTypeHtml.class.php:812
 msgid "Update Settings"
 msgstr "Einstellungen aktualisieren"
 
@@ -19421,7 +19421,7 @@
 msgstr "Richten Sie Einstellungen ein, wie z.B. Ablaufzeit, Emailadressen"
 
 #: www/tracker/admin/tracker.php:41
-#: www/tracker/include/ArtifactTypeHtml.class.php:815
+#: www/tracker/include/ArtifactTypeHtml.class.php:817
 msgid "Manage Custom Fields"
 msgstr "Hinzufügen/Aktualisieren Extra-Felder"
 
@@ -19438,7 +19438,7 @@
 "Produkttypen"
 
 #: www/tracker/admin/tracker.php:46
-#: www/tracker/include/ArtifactTypeHtml.class.php:820
+#: www/tracker/include/ArtifactTypeHtml.class.php:822
 msgid "Manage Workflow"
 msgstr "Workflow verwalten"
 
@@ -19447,7 +19447,7 @@
 msgstr "Tracker Workflow bearbeiten."
 
 #: www/tracker/admin/tracker.php:51
-#: www/tracker/include/ArtifactTypeHtml.class.php:825
+#: www/tracker/include/ArtifactTypeHtml.class.php:827
 msgid "Customize List"
 msgstr "Liste Anpassen"
 
@@ -19456,7 +19456,7 @@
 msgstr "Anzeige für den Tracker Anpassen"
 
 #: www/tracker/admin/tracker.php:56
-#: www/tracker/include/ArtifactTypeHtml.class.php:830
+#: www/tracker/include/ArtifactTypeHtml.class.php:832
 msgid "Add/Update Canned Responses"
 msgstr "Vorgefertigte Antworten hinzufügen/aktualisieren"
 
@@ -19718,8 +19718,8 @@
 msgstr "Alle abwählen"
 
 #: www/tracker/browse.php:887
-#: www/tracker/include/ArtifactTypeHtml.class.php:656
-#: www/tracker/include/ArtifactTypeHtml.class.php:688
+#: www/tracker/include/ArtifactTypeHtml.class.php:658
+#: www/tracker/include/ArtifactTypeHtml.class.php:690
 msgid "Nobody"
 msgstr "Niemanden"
 
@@ -19791,89 +19791,89 @@
 msgstr "Foren für %1$s"
 
 #: www/tracker/include/ArtifactTypeFactoryHtml.class.php:45
-#: www/tracker/include/ArtifactTypeHtml.class.php:750
+#: www/tracker/include/ArtifactTypeHtml.class.php:752
 #, fuzzy
 msgid "View Trackers"
 msgstr "Neuer Tracker"
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:139
+#: www/tracker/include/ArtifactTypeHtml.class.php:141
 msgid "No related tasks."
 msgstr "Keine Aufgabenbezüge."
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:149
+#: www/tracker/include/ArtifactTypeHtml.class.php:151
 msgid "Remove Relation"
 msgstr "Entferne Beziehung"
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:186
+#: www/tracker/include/ArtifactTypeHtml.class.php:188
 #, php-format
 msgid "Average completion rate: %d%%"
 msgstr "Durchschnittliche Abschussrate: %d%%"
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:231
+#: www/tracker/include/ArtifactTypeHtml.class.php:233
 #, fuzzy
 msgid "Tick an attachment and submit to delete it."
 msgstr "Anhaken und abschicken, um die Beziehung zu entfernen."
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:611
+#: www/tracker/include/ArtifactTypeHtml.class.php:613
 #, php-format
 msgid "[#%d] (unknown)"
 msgstr "[#%d] (unbekannt)"
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:625
+#: www/tracker/include/ArtifactTypeHtml.class.php:627
 msgid ""
 "Tip: Enter a space-separated list of artifact ids ([#NNN] also accepted)"
 msgstr ""
 "Tipp: Geben Sie eine durch Leerzeichen getrennte Liste von Artefakt-IDs ein "
 "([#NNN] wird auch akzeptiert)."
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:746
+#: www/tracker/include/ArtifactTypeHtml.class.php:748
 #, fuzzy
 msgid "Create a new Tracker"
 msgstr "Standardwert für neue Tracker"
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:752
+#: www/tracker/include/ArtifactTypeHtml.class.php:754
 msgid "-tooltip:tracker:viewtrackers"
 msgstr ""
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:758
+#: www/tracker/include/ArtifactTypeHtml.class.php:760
 msgid "Browse all items in the current Tracker"
 msgstr "Alle Elemente im aktuellen Tracker druchsuchen"
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:761
+#: www/tracker/include/ArtifactTypeHtml.class.php:763
 msgid "Download .csv"
 msgstr ".csv herunterladen"
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:764
+#: www/tracker/include/ArtifactTypeHtml.class.php:766
 msgid "Download an overview over the items in the current Tracker as CSV file"
 msgstr ""
 "Herunterladen einer Übersicht über die Elemente im aktuellen Tracker als CSV "
 "Datei"
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:767
+#: www/tracker/include/ArtifactTypeHtml.class.php:769
 msgid "Submit New"
 msgstr "Eintrag anlegen"
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:770
+#: www/tracker/include/ArtifactTypeHtml.class.php:772
 msgid "Enter a new item into the current Tracker"
 msgstr "Neues Element in den aktuellen Tracker eintragen"
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:777
+#: www/tracker/include/ArtifactTypeHtml.class.php:779
 msgid "-tooltip:tracker:reporting"
 msgstr ""
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:780
+#: www/tracker/include/ArtifactTypeHtml.class.php:782
 msgid "Stop Monitor"
 msgstr "Beobachtung beenden"
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:784
+#: www/tracker/include/ArtifactTypeHtml.class.php:786
 msgid "-tooltip:tracker:stopmonitor"
 msgstr ""
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:793
+#: www/tracker/include/ArtifactTypeHtml.class.php:795
 msgid "-tooltip:tracker:startmonitor"
 msgstr ""
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:803
+#: www/tracker/include/ArtifactTypeHtml.class.php:805
 msgid ""
 "Administrating that tracker; click here to return to the Tracker Admin "
 "overview page"
@@ -19881,49 +19881,49 @@
 "Verwalte den Tracker; hier anklicken um zur Tracker Admin Übersichtsseite zu "
 "kommen."
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:805
+#: www/tracker/include/ArtifactTypeHtml.class.php:807
 msgid "Administrate the current tracker"
 msgstr "Aktuellen Tracker verwalten"
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:813
+#: www/tracker/include/ArtifactTypeHtml.class.php:815
 msgid "-tooltip:tracker:updatesettings"
 msgstr ""
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:818
+#: www/tracker/include/ArtifactTypeHtml.class.php:820
 #, fuzzy
 msgid "-tooltip:tracker:managecustomfields"
 msgstr "In Tracker und extra Felder"
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:823
+#: www/tracker/include/ArtifactTypeHtml.class.php:825
 msgid "Assign Role permissions to state transitions"
 msgstr "Befugnisse der Rolle zur Festlegung der Übergänge"
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:828
+#: www/tracker/include/ArtifactTypeHtml.class.php:830
 msgid "-tooltip:tracker:customiselist"
 msgstr ""
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:833
+#: www/tracker/include/ArtifactTypeHtml.class.php:835
 msgid "-tooltip:tracker:cannedresp"
 msgstr ""
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:838
+#: www/tracker/include/ArtifactTypeHtml.class.php:840
 msgid "-tooltip:tracker:clonetracker"
 msgstr ""
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:840
+#: www/tracker/include/ArtifactTypeHtml.class.php:842
 #, fuzzy
 msgid "Really delete the entire tracker"
 msgstr "Diesen Tracker dauerhaft löschen."
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:843
+#: www/tracker/include/ArtifactTypeHtml.class.php:845
 #, fuzzy
 msgid "Irrevocably delete this entire Tracker and all its contents"
 msgstr ""
 "Sie sind dabei diesen Tracker und dessen gesamten Inhalt dauerhaft und "
 "unwiderbringlich zu löschen!"
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:956
-#: www/tracker/include/ArtifactTypeHtml.class.php:961
+#: www/tracker/include/ArtifactTypeHtml.class.php:958
+#: www/tracker/include/ArtifactTypeHtml.class.php:963
 #: www/tracker/query.php:368
 #, php-format
 msgid "(%% for wildcards)"
@@ -19964,107 +19964,107 @@
 msgid "%1$s %2$s: Submit New"
 msgstr "%1$s %2$s: Erstellen"
 
-#: www/tracker/item.php:189
+#: www/tracker/item.php:194
 msgid "New submission"
 msgstr "Neu Eingabe"
 
-#: www/tracker/item.php:192
+#: www/tracker/item.php:197
 msgid "Date Submitted"
 msgstr "Datum abgeschickt"
 
-#: www/tracker/item.php:197
+#: www/tracker/item.php:202
 msgid "Date Closed"
 msgstr "Datum geschlossen"
 
-#: www/tracker/item.php:210
+#: www/tracker/item.php:215
 msgid "Data Type"
 msgstr "Datentyp"
 
-#: www/tracker/item.php:237
+#: www/tracker/item.php:242
 msgid "Stop monitor"
 msgstr "Stoppe Beobachtung"
 
-#: www/tracker/item.php:265 www/tracker/item.php:405 www/tracker/query.php:267
+#: www/tracker/item.php:270 www/tracker/item.php:410 www/tracker/query.php:267
 msgid "Save Changes"
 msgstr "Änderungen speichern"
 
-#: www/tracker/item.php:271
+#: www/tracker/item.php:276
 msgid "Please login"
 msgstr "Bitte einloggen"
 
-#: www/tracker/item.php:278
+#: www/tracker/item.php:283
 msgid "Please log in."
 msgstr "Bitte melde Dich beim System an."
 
-#: www/tracker/item.php:279
+#: www/tracker/item.php:284
 msgid ""
 "If you <strong>cannot</strong> login, then enter your email address here to "
 "submit a new item, post a comment or make any other permitted changes."
 msgstr ""
 
-#: www/tracker/item.php:281
+#: www/tracker/item.php:286
 msgid "Anonymous User eMail"
 msgstr "Anonymer Benutzer eMail"
 
-#: www/tracker/item.php:290
+#: www/tracker/item.php:295
 #, fuzzy
 msgid "Debugging Functions"
 msgstr "Mathematische Funktionen"
 
-#: www/tracker/item.php:307
+#: www/tracker/item.php:312
 #, fuzzy
 msgid "Item Description"
 msgstr "Beschreibung"
 
-#: www/tracker/item.php:349 www/tracker/query.php:387
+#: www/tracker/item.php:354 www/tracker/query.php:387
 msgid "Followups"
 msgstr "Kommentare"
 
-#: www/tracker/item.php:350
+#: www/tracker/item.php:355
 msgid "No Followups Have Been Posted"
 msgstr "Es wurden bislang keine Kommentare verfaßt."
 
-#: www/tracker/item.php:364
+#: www/tracker/item.php:369
 msgid "Attach files to this submission"
 msgstr "Dateien an diesen Eintrag anhängen"
 
-#: www/tracker/item.php:372
+#: www/tracker/item.php:377
 msgid "Create an attachment"
 msgstr "Dateianhang erstellen"
 
-#: www/tracker/item.php:387
+#: www/tracker/item.php:392
 msgid "OR use a canned response"
 msgstr "ODER eine vorgespeicherte Antwort benutzen"
 
-#: www/tracker/item.php:402
+#: www/tracker/item.php:407
 msgid "indicates required fields."
 msgstr "zeigt Pflichtfelder an."
 
-#: www/tracker/item.php:412
+#: www/tracker/item.php:417
 msgid "Item Relationships"
 msgstr "Beziehungen zwischen Einträgen"
 
-#: www/tracker/item.php:421
+#: www/tracker/item.php:426
 msgid "You do not have sufficient privileges to view Task relations."
 msgstr "Du hast ungenügende Rechte, Aufgabenbeziehungen einzusehen."
 
-#: www/tracker/item.php:423
+#: www/tracker/item.php:428
 msgid "This project does not use Tasks."
 msgstr "Dieses Projekt benutzt Aufgaben nicht."
 
-#: www/tracker/item.php:429
+#: www/tracker/item.php:434
 msgid "Build Task Relation"
 msgstr "Erstelle Aufgabenverbindung"
 
-#: www/tracker/item.php:430
+#: www/tracker/item.php:435
 msgid "Related Tasks"
 msgstr "Verwandte Aufgaben"
 
-#: www/tracker/item.php:452
+#: www/tracker/item.php:457
 msgid "Instructions"
 msgstr "Anleitung"
 
-#: www/tracker/item.php:455
+#: www/tracker/item.php:460
 msgid "DO NOT enter passwords or confidential information in your message!"
 msgstr ""
 "Fügen Sie KEINE Paßwörter oder vertrauliche Informationen in Ihre Nachricht "

Modified: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/translations/fusionforge.pot
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/translations/fusionforge.pot	2012-04-05 10:25:42 UTC (rev 18232)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/translations/fusionforge.pot	2012-04-05 15:44:19 UTC (rev 18233)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-05 12:14+0200\n"
+"POT-Creation-Date: 2012-04-05 16:29+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -337,8 +337,8 @@
 #: common/docman/views/listfile.php:204 common/docman/views/listfile.php:206
 #: common/forum/ForumHTML.class.php:65 common/forum/ForumHTML.class.php:222
 #: common/forum/ForumHTML.class.php:463 common/include/descriptive.php:133
-#: common/pm/ProjectTask.class.php:1226 common/tracker/Artifact.class.php:1518
-#: common/tracker/Artifact.class.php:1610
+#: common/pm/ProjectTask.class.php:1226 common/tracker/Artifact.class.php:1519
+#: common/tracker/Artifact.class.php:1611
 #: common/widget/Widget_MyLatestSvnCommits.class.php:65
 #: common/widget/Widget_ProjectInfo.class.php:66
 #: common/widget/Widget_Rss.class.php:74
@@ -376,10 +376,10 @@
 #: www/tracker/downloadcsv.php:65
 #: www/tracker/include/ArtifactHtml.class.php:60
 #: www/tracker/include/ArtifactHtml.class.php:69
-#: www/tracker/include/ArtifactTypeHtml.class.php:160
-#: www/tracker/include/ArtifactTypeHtml.class.php:161
-#: www/tracker/include/ArtifactTypeHtml.class.php:223 www/tracker/item.php:193
-#: www/tracker/item.php:198
+#: www/tracker/include/ArtifactTypeHtml.class.php:162
+#: www/tracker/include/ArtifactTypeHtml.class.php:163
+#: www/tracker/include/ArtifactTypeHtml.class.php:225 www/tracker/item.php:198
+#: www/tracker/item.php:203
 msgid "Y-m-d H:i"
 msgstr ""
 
@@ -725,13 +725,13 @@
 #: www/tracker/admin/form-addextrafield.php:132
 #: www/tracker/admin/form-addextrafieldoption.php:101
 #: www/tracker/admin/form-updateextrafieldelement.php:60
-#: www/tracker/include/ArtifactTypeHtml.class.php:147 www/tracker/item.php:140
+#: www/tracker/include/ArtifactTypeHtml.class.php:149 www/tracker/item.php:141
 msgid "Status"
 msgstr ""
 
 #: common/docman/views/listfile.php:121 www/frs/index.php:183
 #: www/pm/ganttpage.php:160 www/project/admin/editimages.php:269
-#: www/tracker/include/ArtifactTypeHtml.class.php:203
+#: www/tracker/include/ArtifactTypeHtml.class.php:205
 msgid "Size"
 msgstr ""
 
@@ -830,8 +830,8 @@
 #: common/include/rbac_texts.php:219
 #: common/widget/Widget_MyProjects.class.php:79
 #: plugins/mantisbt/www/index.php:49 www/include/Layout.class.php:694
-#: www/tracker/admin/ind.php:90 www/tracker/item.php:173
-#: www/tracker/item.php:392
+#: www/tracker/admin/ind.php:90 www/tracker/item.php:178
+#: www/tracker/item.php:397
 msgid "Admin"
 msgstr ""
 
@@ -891,7 +891,7 @@
 #: www/tracker/admin/form-deletetracker.php:34
 #: www/tracker/admin/tracker.php:66 www/tracker/browse.php:176
 #: www/tracker/browse.php:503 www/tracker/deleteartifact.php:38
-#: www/tracker/item.php:256
+#: www/tracker/item.php:261
 msgid "Delete"
 msgstr ""
 
@@ -1178,7 +1178,7 @@
 #: www/search/include/renderers/TrackersHtmlSearchRenderer.class.php:51
 #: www/stats/lastlogins.php:50 www/stats/users_graph.php:85
 #: www/stats/views_graph.php:105 www/tracker/include/ArtifactHtml.class.php:46
-#: www/tracker/include/ArtifactTypeHtml.class.php:201
+#: www/tracker/include/ArtifactTypeHtml.class.php:203
 msgid "Date"
 msgstr ""
 
@@ -1191,7 +1191,7 @@
 #: www/search/include/renderers/TasksHtmlSearchRenderer.class.php:49
 #: www/search/include/renderers/TrackersHtmlSearchRenderer.class.php:49
 #: www/tracker/admin/form-customizelist.php:42 www/tracker/browse.php:281
-#: www/tracker/browse.php:673 www/tracker/item.php:313
+#: www/tracker/browse.php:673 www/tracker/item.php:318
 #: www/tracker/query.php:199 www/tracker/query.php:383
 msgid "Summary"
 msgstr ""
@@ -1235,7 +1235,7 @@
 #: www/scm/include/scm_utils.php:90 www/survey/include/SurveyHTML.class.php:65
 #: www/survey/include/SurveyHTML.class.php:90 www/tracker/admin/tracker.php:28
 #: www/tracker/include/ArtifactTypeFactoryHtml.class.php:52
-#: www/tracker/include/ArtifactTypeHtml.class.php:799 www/tracker/ind.php:44
+#: www/tracker/include/ArtifactTypeHtml.class.php:801 www/tracker/ind.php:44
 msgid "Administration"
 msgstr ""
 
@@ -2025,7 +2025,7 @@
 #: www/pm/include/ProjectGroupHTML.class.php:105
 #: www/scm/include/scm_utils.php:86
 #: www/tracker/include/ArtifactTypeFactoryHtml.class.php:48
-#: www/tracker/include/ArtifactTypeHtml.class.php:774
+#: www/tracker/include/ArtifactTypeHtml.class.php:776
 msgid "Reporting"
 msgstr ""
 
@@ -2981,9 +2981,9 @@
 #: www/include/html.php:422 www/include/html.php:514 www/include/html.php:531
 #: www/include/html.php:565 www/include/html.php:606 www/include/html.php:645
 #: www/pm/ganttpage.php:62 www/tracker/include/ArtifactHtml.class.php:64
-#: www/tracker/include/ArtifactTypeHtml.class.php:428
-#: www/tracker/include/ArtifactTypeHtml.class.php:489
-#: www/tracker/include/ArtifactTypeHtml.class.php:721
+#: www/tracker/include/ArtifactTypeHtml.class.php:430
+#: www/tracker/include/ArtifactTypeHtml.class.php:491
+#: www/tracker/include/ArtifactTypeHtml.class.php:723
 msgid "None"
 msgstr ""
 
@@ -3480,7 +3480,8 @@
 
 #: common/tracker/ArtifactExtraField.class.php:124
 #: common/tracker/ArtifactExtraField.class.php:387
-msgid "Field name already exists"
+#, php-format
+msgid "Field name \"%s\" already exists"
 msgstr ""
 
 #: common/tracker/ArtifactExtraField.class.php:186
@@ -4002,7 +4003,7 @@
 msgstr ""
 
 #: common/widget/Widget_ProjectLatestFileReleases.class.php:64
-#: www/tracker/include/ArtifactTypeHtml.class.php:789 www/tracker/item.php:240
+#: www/tracker/include/ArtifactTypeHtml.class.php:791 www/tracker/item.php:245
 msgid "Monitor"
 msgstr ""
 
@@ -4350,7 +4351,7 @@
 #: plugins/scmsvn/common/SVNPlugin.class.php:192 www/admin/useredit.php:234
 #: www/project/admin/editimages.php:267 www/reporting/usersummary.php:101
 #: www/search/include/renderers/SkillHtmlSearchRenderer.class.php:44
-#: www/sendmessage.php:69 www/tracker/include/ArtifactTypeHtml.class.php:200
+#: www/sendmessage.php:69 www/tracker/include/ArtifactTypeHtml.class.php:202
 msgid "Name"
 msgstr ""
 
@@ -7291,7 +7292,7 @@
 "%1$s</tt> VOB in your ClearCase Explorer."
 msgstr ""
 
-#: plugins/scmccase/common/CCasePlugin.class.php:111 www/tracker/item.php:448
+#: plugins/scmccase/common/CCasePlugin.class.php:111 www/tracker/item.php:453
 msgid "History"
 msgstr ""
 
@@ -8569,7 +8570,7 @@
 #: www/activity/index.php:244 www/pm/include/ProjectTaskHTML.class.php:154
 #: www/project/admin/project_admin_utils.php:147
 #: www/tracker/include/ArtifactHtml.class.php:47
-#: www/tracker/include/ArtifactTypeHtml.class.php:202
+#: www/tracker/include/ArtifactTypeHtml.class.php:204
 msgid "By"
 msgstr ""
 
@@ -9407,7 +9408,7 @@
 #: www/news/admin/index.php:133 www/pm/templates/detail_template.php:64
 #: www/search/include/renderers/ArtifactHtmlSearchRenderer.class.php:57
 #: www/search/include/renderers/TrackersHtmlSearchRenderer.class.php:50
-#: www/tracker/browse.php:698 www/tracker/item.php:201
+#: www/tracker/browse.php:698 www/tracker/item.php:206
 msgid "Submitted by"
 msgstr ""
 
@@ -10379,7 +10380,7 @@
 
 #: www/forum/attachment.php:42 www/forum/attachment.php:126
 #: www/forum/attachment.php:154
-#: www/tracker/include/ArtifactTypeHtml.class.php:196
+#: www/tracker/include/ArtifactTypeHtml.class.php:198
 msgid "Attachments"
 msgstr ""
 
@@ -11985,14 +11986,14 @@
 #: www/pm/include/pm_columns.php:37 www/pm/templates/detail_template.php:20
 #: www/tracker/admin/form-customizelist.php:45 www/tracker/browse.php:280
 #: www/tracker/browse.php:691 www/tracker/browse.php:883
-#: www/tracker/item.php:153 www/tracker/query.php:198
+#: www/tracker/item.php:156 www/tracker/query.php:198
 msgid "Priority"
 msgstr ""
 
 #: www/my/dashboard.php:71 www/pm/browse_task.php:411
 #: www/pm/browse_task.php:617 www/pm/templates/detail_template.php:30
 #: www/tracker/browse.php:694 www/tracker/browse.php:886
-#: www/tracker/item.php:167
+#: www/tracker/item.php:172
 msgid "Assigned to"
 msgstr ""
 
@@ -12691,7 +12692,7 @@
 #: www/pm/browse_task.php:401 www/pm/ganttpage.php:70
 #: www/pm/include/pm_columns.php:32 www/pm/templates/detail_template.php:42
 #: www/search/include/renderers/TasksHtmlSearchRenderer.class.php:50
-#: www/tracker/include/ArtifactTypeHtml.class.php:145
+#: www/tracker/include/ArtifactTypeHtml.class.php:147
 msgid "Start Date"
 msgstr ""
 
@@ -12701,7 +12702,7 @@
 #: www/pm/include/pm_columns.php:33 www/pm/templates/detail_template.php:47
 #: www/reporting/usersummary.php:106
 #: www/search/include/renderers/TasksHtmlSearchRenderer.class.php:51
-#: www/tracker/include/ArtifactTypeHtml.class.php:146
+#: www/tracker/include/ArtifactTypeHtml.class.php:148
 msgid "End Date"
 msgstr ""
 
@@ -13072,7 +13073,7 @@
 #: www/pm/browse_task.php:215 www/pm/browse_task.php:399
 #: www/pm/ganttpage.php:69 www/pm/include/ProjectTaskHTML.class.php:84
 #: www/pm/templates/detail_template.php:99
-#: www/tracker/include/ArtifactTypeHtml.class.php:144
+#: www/tracker/include/ArtifactTypeHtml.class.php:146
 msgid "Task Summary"
 msgstr ""
 
@@ -13686,7 +13687,7 @@
 msgid "Task Successfully Deleted"
 msgstr ""
 
-#: www/pm/templates/detail_template.php:69 www/tracker/item.php:227
+#: www/pm/templates/detail_template.php:69 www/tracker/item.php:232
 msgid "Permalink"
 msgstr ""
 
@@ -16816,7 +16817,7 @@
 msgstr ""
 
 #: www/tracker/admin/form-clonetracker.php:48
-#: www/tracker/include/ArtifactTypeHtml.class.php:835
+#: www/tracker/include/ArtifactTypeHtml.class.php:837
 msgid "Clone Tracker"
 msgstr ""
 
@@ -16857,8 +16858,8 @@
 msgid "Close Date"
 msgstr ""
 
-#: www/tracker/admin/form-customizelist.php:49 www/tracker/item.php:330
-#: www/tracker/item.php:341 www/tracker/query.php:385
+#: www/tracker/admin/form-customizelist.php:49 www/tracker/item.php:335
+#: www/tracker/item.php:346 www/tracker/query.php:385
 msgid "Detailed description"
 msgstr ""
 
@@ -17128,7 +17129,7 @@
 msgstr ""
 
 #: www/tracker/admin/tracker.php:31
-#: www/tracker/include/ArtifactTypeHtml.class.php:744
+#: www/tracker/include/ArtifactTypeHtml.class.php:746
 msgid "New Tracker"
 msgstr ""
 
@@ -17137,7 +17138,7 @@
 msgstr ""
 
 #: www/tracker/admin/tracker.php:36
-#: www/tracker/include/ArtifactTypeHtml.class.php:810
+#: www/tracker/include/ArtifactTypeHtml.class.php:812
 msgid "Update Settings"
 msgstr ""
 
@@ -17146,7 +17147,7 @@
 msgstr ""
 
 #: www/tracker/admin/tracker.php:41
-#: www/tracker/include/ArtifactTypeHtml.class.php:815
+#: www/tracker/include/ArtifactTypeHtml.class.php:817
 msgid "Manage Custom Fields"
 msgstr ""
 
@@ -17158,7 +17159,7 @@
 msgstr ""
 
 #: www/tracker/admin/tracker.php:46
-#: www/tracker/include/ArtifactTypeHtml.class.php:820
+#: www/tracker/include/ArtifactTypeHtml.class.php:822
 msgid "Manage Workflow"
 msgstr ""
 
@@ -17167,7 +17168,7 @@
 msgstr ""
 
 #: www/tracker/admin/tracker.php:51
-#: www/tracker/include/ArtifactTypeHtml.class.php:825
+#: www/tracker/include/ArtifactTypeHtml.class.php:827
 msgid "Customize List"
 msgstr ""
 
@@ -17176,7 +17177,7 @@
 msgstr ""
 
 #: www/tracker/admin/tracker.php:56
-#: www/tracker/include/ArtifactTypeHtml.class.php:830
+#: www/tracker/include/ArtifactTypeHtml.class.php:832
 msgid "Add/Update Canned Responses"
 msgstr ""
 
@@ -17420,8 +17421,8 @@
 msgstr ""
 
 #: www/tracker/browse.php:887
-#: www/tracker/include/ArtifactTypeHtml.class.php:656
-#: www/tracker/include/ArtifactTypeHtml.class.php:688
+#: www/tracker/include/ArtifactTypeHtml.class.php:658
+#: www/tracker/include/ArtifactTypeHtml.class.php:690
 msgid "Nobody"
 msgstr ""
 
@@ -17490,125 +17491,125 @@
 msgstr ""
 
 #: www/tracker/include/ArtifactTypeFactoryHtml.class.php:45
-#: www/tracker/include/ArtifactTypeHtml.class.php:750
+#: www/tracker/include/ArtifactTypeHtml.class.php:752
 msgid "View Trackers"
 msgstr ""
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:139
+#: www/tracker/include/ArtifactTypeHtml.class.php:141
 msgid "No related tasks."
 msgstr ""
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:149
+#: www/tracker/include/ArtifactTypeHtml.class.php:151
 msgid "Remove Relation"
 msgstr ""
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:186
+#: www/tracker/include/ArtifactTypeHtml.class.php:188
 #, php-format
 msgid "Average completion rate: %d%%"
 msgstr ""
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:231
+#: www/tracker/include/ArtifactTypeHtml.class.php:233
 msgid "Tick an attachment and submit to delete it."
 msgstr ""
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:611
+#: www/tracker/include/ArtifactTypeHtml.class.php:613
 #, php-format
 msgid "[#%d] (unknown)"
 msgstr ""
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:625
+#: www/tracker/include/ArtifactTypeHtml.class.php:627
 msgid ""
 "Tip: Enter a space-separated list of artifact ids ([#NNN] also accepted)"
 msgstr ""
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:746
+#: www/tracker/include/ArtifactTypeHtml.class.php:748
 msgid "Create a new Tracker"
 msgstr ""
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:752
+#: www/tracker/include/ArtifactTypeHtml.class.php:754
 msgid "-tooltip:tracker:viewtrackers"
 msgstr ""
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:758
+#: www/tracker/include/ArtifactTypeHtml.class.php:760
 msgid "Browse all items in the current Tracker"
 msgstr ""
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:761
+#: www/tracker/include/ArtifactTypeHtml.class.php:763
 msgid "Download .csv"
 msgstr ""
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:764
+#: www/tracker/include/ArtifactTypeHtml.class.php:766
 msgid "Download an overview over the items in the current Tracker as CSV file"
 msgstr ""
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:767
+#: www/tracker/include/ArtifactTypeHtml.class.php:769
 msgid "Submit New"
 msgstr ""
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:770
+#: www/tracker/include/ArtifactTypeHtml.class.php:772
 msgid "Enter a new item into the current Tracker"
 msgstr ""
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:777
+#: www/tracker/include/ArtifactTypeHtml.class.php:779
 msgid "-tooltip:tracker:reporting"
 msgstr ""
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:780
+#: www/tracker/include/ArtifactTypeHtml.class.php:782
 msgid "Stop Monitor"
 msgstr ""
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:784
+#: www/tracker/include/ArtifactTypeHtml.class.php:786
 msgid "-tooltip:tracker:stopmonitor"
 msgstr ""
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:793
+#: www/tracker/include/ArtifactTypeHtml.class.php:795
 msgid "-tooltip:tracker:startmonitor"
 msgstr ""
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:803
+#: www/tracker/include/ArtifactTypeHtml.class.php:805
 msgid ""
 "Administrating that tracker; click here to return to the Tracker Admin "
 "overview page"
 msgstr ""
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:805
+#: www/tracker/include/ArtifactTypeHtml.class.php:807
 msgid "Administrate the current tracker"
 msgstr ""
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:813
+#: www/tracker/include/ArtifactTypeHtml.class.php:815
 msgid "-tooltip:tracker:updatesettings"
 msgstr ""
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:818
+#: www/tracker/include/ArtifactTypeHtml.class.php:820
 msgid "-tooltip:tracker:managecustomfields"
 msgstr ""
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:823
+#: www/tracker/include/ArtifactTypeHtml.class.php:825
 msgid "Assign Role permissions to state transitions"
 msgstr ""
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:828
+#: www/tracker/include/ArtifactTypeHtml.class.php:830
 msgid "-tooltip:tracker:customiselist"
 msgstr ""
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:833
+#: www/tracker/include/ArtifactTypeHtml.class.php:835
 msgid "-tooltip:tracker:cannedresp"
 msgstr ""
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:838
+#: www/tracker/include/ArtifactTypeHtml.class.php:840
 msgid "-tooltip:tracker:clonetracker"
 msgstr ""
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:840
+#: www/tracker/include/ArtifactTypeHtml.class.php:842
 msgid "Really delete the entire tracker"
 msgstr ""
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:843
+#: www/tracker/include/ArtifactTypeHtml.class.php:845
 msgid "Irrevocably delete this entire Tracker and all its contents"
 msgstr ""
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:956
-#: www/tracker/include/ArtifactTypeHtml.class.php:961
+#: www/tracker/include/ArtifactTypeHtml.class.php:958
+#: www/tracker/include/ArtifactTypeHtml.class.php:963
 #: www/tracker/query.php:368
 #, php-format
 msgid "(%% for wildcards)"
@@ -17643,105 +17644,105 @@
 msgid "%1$s %2$s: Submit New"
 msgstr ""
 
-#: www/tracker/item.php:189
+#: www/tracker/item.php:194
 msgid "New submission"
 msgstr ""
 
-#: www/tracker/item.php:192
+#: www/tracker/item.php:197
 msgid "Date Submitted"
 msgstr ""
 
-#: www/tracker/item.php:197
+#: www/tracker/item.php:202
 msgid "Date Closed"
 msgstr ""
 
-#: www/tracker/item.php:210
+#: www/tracker/item.php:215
 msgid "Data Type"
 msgstr ""
 
-#: www/tracker/item.php:237
+#: www/tracker/item.php:242
 msgid "Stop monitor"
 msgstr ""
 
-#: www/tracker/item.php:265 www/tracker/item.php:405 www/tracker/query.php:267
+#: www/tracker/item.php:270 www/tracker/item.php:410 www/tracker/query.php:267
 msgid "Save Changes"
 msgstr ""
 
-#: www/tracker/item.php:271
+#: www/tracker/item.php:276
 msgid "Please login"
 msgstr ""
 
-#: www/tracker/item.php:278
+#: www/tracker/item.php:283
 msgid "Please log in."
 msgstr ""
 
-#: www/tracker/item.php:279
+#: www/tracker/item.php:284
 msgid ""
 "If you <strong>cannot</strong> login, then enter your email address here to "
 "submit a new item, post a comment or make any other permitted changes."
 msgstr ""
 
-#: www/tracker/item.php:281
+#: www/tracker/item.php:286
 msgid "Anonymous User eMail"
 msgstr ""
 
-#: www/tracker/item.php:290
+#: www/tracker/item.php:295
 msgid "Debugging Functions"
 msgstr ""
 
-#: www/tracker/item.php:307
+#: www/tracker/item.php:312
 msgid "Item Description"
 msgstr ""
 
-#: www/tracker/item.php:349 www/tracker/query.php:387
+#: www/tracker/item.php:354 www/tracker/query.php:387
 msgid "Followups"
 msgstr ""
 
-#: www/tracker/item.php:350
+#: www/tracker/item.php:355
 msgid "No Followups Have Been Posted"
 msgstr ""
 
-#: www/tracker/item.php:364
+#: www/tracker/item.php:369
 msgid "Attach files to this submission"
 msgstr ""
 
-#: www/tracker/item.php:372
+#: www/tracker/item.php:377
 msgid "Create an attachment"
 msgstr ""
 
-#: www/tracker/item.php:387
+#: www/tracker/item.php:392
 msgid "OR use a canned response"
 msgstr ""
 
-#: www/tracker/item.php:402
+#: www/tracker/item.php:407
 msgid "indicates required fields."
 msgstr ""
 
-#: www/tracker/item.php:412
+#: www/tracker/item.php:417
 msgid "Item Relationships"
 msgstr ""
 
-#: www/tracker/item.php:421
+#: www/tracker/item.php:426
 msgid "You do not have sufficient privileges to view Task relations."
 msgstr ""
 
-#: www/tracker/item.php:423
+#: www/tracker/item.php:428
 msgid "This project does not use Tasks."
 msgstr ""
 
-#: www/tracker/item.php:429
+#: www/tracker/item.php:434
 msgid "Build Task Relation"
 msgstr ""
 
-#: www/tracker/item.php:430
+#: www/tracker/item.php:435
 msgid "Related Tasks"
 msgstr ""
 
-#: www/tracker/item.php:452
+#: www/tracker/item.php:457
 msgid "Instructions"
 msgstr ""
 
-#: www/tracker/item.php:455
+#: www/tracker/item.php:460
 msgid "DO NOT enter passwords or confidential information in your message!"
 msgstr ""
 

Modified: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/tracker/include/ArtifactTypeHtml.class.php
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/tracker/include/ArtifactTypeHtml.class.php	2012-04-05 10:25:42 UTC (rev 18232)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/tracker/include/ArtifactTypeHtml.class.php	2012-04-05 15:44:19 UTC (rev 18233)
@@ -118,12 +118,14 @@
 			}
 		}
 		if ($found === false) {
-			return;
+			return false;
 		}
 
-		$efarr = array($found => $ofarr[$found]);
-		$template = $this->generateEfRender($ofarr[$found], $mode);
+		$ef_found = $ofarr[$found];
+		$efarr = array($found => $ef_found);
+		$template = $this->generateEfRender($ef_found, $mode);
 		$this->_substExtraFields($mode, $efarr, $selected, $show_100, $text_100, $show_any, $text_any, $status_show_100, $template);
+		return $ef_found;
 	}
 
 	function renderRelatedTasks($group, $ah) {

Modified: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/tracker/item.php
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/tracker/item.php	2012-04-05 10:25:42 UTC (rev 18232)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/tracker/item.php	2012-04-05 15:44:19 UTC (rev 18233)
@@ -131,10 +131,11 @@
 <tr align="left" valign="top">
 <?php
 echo "<td " . $HTML->boxGetAltRowStyle(0) . " width=\"30%\">\n";
+$i = false;
 if (!$is_add) {
 	if ($ath->usesCustomStatuses()) {
-		$ath->renderExtraField($data_extrafields, true, 'none', false,
-		    'Any', array(), false, $mode_extrafields, 'Status');
+		$i = $ath->renderExtraField($data_extrafields, true, 'none',
+		    false, 'Any', array(), false, $mode_extrafields, 'Status');
 		$skip_extrafields[] = 'Status';
 	} else {
 		echo "\t<div><strong>" . _('Status') . ":</strong><br />\n";
@@ -146,8 +147,10 @@
 		echo "</div>\n";
 	}
 }
-$ath->renderExtraField($data_extrafields, true, 'none', false,
-    'Any', array(), false, $mode_extrafields, 'Resolution');
+if (!$i || $i['field_name'] != 'Resolution') {
+	$ath->renderExtraField($data_extrafields, true, 'none', false,
+	    'Any', array(), false, $mode_extrafields, 'Resolution');
+}
 $skip_extrafields[] = 'Resolution';
 ?>
 	<div><strong><?php echo _('Priority'); ?>:</strong><br /><?php
@@ -159,8 +162,10 @@
 }
 ?></div>
 <?php
-$ath->renderExtraField($data_extrafields, true, 'none', false,
-    'Any', array(), false, $mode_extrafields, 'Severity');
+if (!$i || $i['field_name'] != 'Severity') {
+	$ath->renderExtraField($data_extrafields, true, 'none', false,
+	    'Any', array(), false, $mode_extrafields, 'Severity');
+}
 $skip_extrafields[] = 'Severity';
 if (!$is_add || $accesslevel >= TRK_FULL) {
 ?>



More information about the evolvis-commits mailing list