[evolvis-commits] r18236: evolvis-template-group pending merges:↵ Thorsten Glaser 2012-04-05 make Resolution into a Status extra field↵ Thorsten Glaser 2012-04-05 change order of Resolution (initial is “New”), drop renderers (unused)

mirabilos at evolvis.org mirabilos at evolvis.org
Thu Apr 5 17:45:24 CEST 2012


Author: mirabilos
Date: 2012-04-05 17:45:23 +0200 (Thu, 05 Apr 2012)
New Revision: 18236

Modified:
   trunk/gforge_base/evolvisforge-5.1/Makefile
   trunk/gforge_base/evolvisforge-5.1/src/common/tracker/artifact_type_definitions.php
   trunk/gforge_base/evolvisforge-5.1/src/debian/changelog
   trunk/gforge_base/evolvisforge-5.1/src/debian/evolvis.postinst
   trunk/gforge_base/evolvisforge-5.1/src/translations/de.po
   trunk/gforge_base/evolvisforge-5.1/src/translations/fusionforge.pot
Log:
evolvis-template-group pending merges:
  Thorsten Glaser 2012-04-05 make Resolution into a Status extra field
    Thorsten Glaser 2012-04-05 change order of Resolution (initial is “New”), drop renderers (unused)

also, create a new evtemplate51 (for 5.1.1+evolvis51 hah!)
which takes advance of these facts


Modified: trunk/gforge_base/evolvisforge-5.1/Makefile
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/Makefile	2012-04-05 15:45:16 UTC (rev 18235)
+++ trunk/gforge_base/evolvisforge-5.1/Makefile	2012-04-05 15:45:23 UTC (rev 18236)
@@ -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: trunk/gforge_base/evolvisforge-5.1/src/common/tracker/artifact_type_definitions.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/tracker/artifact_type_definitions.php	2012-04-05 15:45:16 UTC (rev 18235)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/tracker/artifact_type_definitions.php	2012-04-05 15:45:23 UTC (rev 18236)
@@ -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: trunk/gforge_base/evolvisforge-5.1/src/debian/changelog
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/debian/changelog	2012-04-05 15:45:16 UTC (rev 18235)
+++ trunk/gforge_base/evolvisforge-5.1/src/debian/changelog	2012-04-05 15:45:23 UTC (rev 18236)
@@ -1,10 +1,14 @@
-fusionforge (5.1.1+evolvis51) xunstable; urgency=low
+fusionforge (5.1.1+evolvis51) unstable; urgency=low
 
   [ Roland Mas ]
   * [#2957] Fix custom fields not being initialised on move across trackers
 
- -- Thorsten Glaser <t.glaser at tarent.de>  Thu, 05 Apr 2012 15:08:35 +0200
+  [ 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
 
+ -- Thorsten Glaser <t.glaser at tarent.de>  Thu, 05 Apr 2012 16:01:57 +0200
+
 fusionforge (5.1.1+evolvis50) unstable; urgency=low
 
   [ Julien Heyman ]

Modified: trunk/gforge_base/evolvisforge-5.1/src/debian/evolvis.postinst
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/debian/evolvis.postinst	2012-04-05 15:45:16 UTC (rev 18235)
+++ trunk/gforge_base/evolvisforge-5.1/src/debian/evolvis.postinst	2012-04-05 15:45:23 UTC (rev 18236)
@@ -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: trunk/gforge_base/evolvisforge-5.1/src/translations/de.po
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/translations/de.po	2012-04-05 15:45:16 UTC (rev 18235)
+++ trunk/gforge_base/evolvisforge-5.1/src/translations/de.po	2012-04-05 15:45:23 UTC (rev 18236)
@@ -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:00+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
@@ -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

Modified: trunk/gforge_base/evolvisforge-5.1/src/translations/fusionforge.pot
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/translations/fusionforge.pot	2012-04-05 15:45:16 UTC (rev 18235)
+++ trunk/gforge_base/evolvisforge-5.1/src/translations/fusionforge.pot	2012-04-05 15:45:23 UTC (rev 18236)
@@ -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:01+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
@@ -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



More information about the evolvis-commits mailing list