Scarab commit: svn commit: r10866 - trunk: . src/conf/classes src/java/org/tigris/scarab/om src/java/org/tigris/scarab/screens src/webapp/WEB-INF/templates/reports src/webapp/WEB-INF/templates/screens src/webapp/WEB-INF/templates/screens/admin src/webapp/WEB-INF/templates/viewIssue
Johannes Höchstädter <[email protected]>
| Newsgroups | gmane.comp.java.scarab.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: jhoech
Date: 2010-01-20 04:58:48-0800
New Revision: 10866
Modified:
trunk/ (props changed)
trunk/src/conf/classes/ScarabBundle_de.properties
trunk/src/conf/classes/ScarabBundle_en.properties
trunk/src/conf/classes/ScarabBundle_es.properties
trunk/src/conf/classes/ScarabBundle_fr.properties
trunk/src/conf/classes/ScarabBundle_it.properties
trunk/src/conf/classes/ScarabBundle_ja.properties
trunk/src/conf/classes/ScarabBundle_ko.properties
trunk/src/conf/classes/ScarabBundle_nl.properties
trunk/src/conf/classes/ScarabBundle_pl.properties
trunk/src/conf/classes/ScarabBundle_pt_BR.properties
trunk/src/conf/classes/ScarabBundle_ru.properties
trunk/src/conf/classes/ScarabBundle_zh_CN.properties
trunk/src/conf/classes/ScarabBundle_zh_TW.properties
trunk/src/java/org/tigris/scarab/om/Activity.java
trunk/src/java/org/tigris/scarab/screens/ViewIssue.java
trunk/src/webapp/WEB-INF/templates/reports/SelectUsers.vm
trunk/src/webapp/WEB-INF/templates/screens/AssignIssue.vm
trunk/src/webapp/WEB-INF/templates/screens/UserList.vm
trunk/src/webapp/WEB-INF/templates/screens/admin/ (props changed)
trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueBody.vm
trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab2.vm
trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab3.vm
trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab4Att.vm
trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab4Dep.vm
trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab4Url.vm
trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab5.vm
Log:
MRG - Merged current changes from 0.22 branch back into trunk. Branch was in revision 10865.
Modified: trunk/src/conf/classes/ScarabBundle_de.properties
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/conf/classes/ScarabBundle_de.properties?view=diff&pathrev=10866&r1=10865&r2=10866
==============================================================================
--- trunk/src/conf/classes/ScarabBundle_de.properties (original)
+++ trunk/src/conf/classes/ScarabBundle_de.properties 2010-01-20 04:58:48-0800
@@ -463,7 +463,7 @@
AssignUsersWithThisIssue=Benutzer zuweisen für {0,choice,1#dieses Ticket|2#diese Tickets}
NoAssignableUserAttributes=Es existieren keine Benutzer-Attribute, die den Benutzern zugewiesen werden können.
AssociateUsersAndIssues=Bitte ein oder mehrere Tickets auswählen, die den Benutzern zugewiesen werden sollen.
-ClickHereToSelectUsers=<a href="#add">Hier klicken</a> um Benutzer auszuwählen, zu denen {0,choice,1#dieses Ticket|2#diese Tickets} assoziiert werden sollen.
+ScrolldownToSelectUsers=<a href="#add">Herunterscrollen</a> um Benutzer auszuwählen, zu denen {0,choice,1#dieses Ticket|2#diese Tickets} assoziiert werden sollen.
ChangesSavedOnDone=Änderungen des Tickets werden erst bei Auswahl von "Fertig" gespeichert
PersonnelAssociatedWithIssue=Dem Ticket {0} zugewiesenes Personal
IssueIdNotValid=Ticketnummer {0} ist ungültig.
@@ -508,7 +508,7 @@
AdvancedQuery=Erweiterte Abfrage
CustomQuery=benutzerdefinierte Abfrage
NoCustomSearch=Es sind keine üblichen Suchattribute für diesen Ticket-Typ angegeben, deshalb wird stattdessen der erweiterte Suchbildschirm angezeigt.
-ClickHereToSelectUsersForQuery=<a href="#add">Hier klicken</a> um Benutzer auszuwählen zu denen diese Abfrage assoziiert werden soll.
+ScrolldownToSelectUsersForQuery=<a href="#add">Herunterscrollen</a> um Benutzer auszuwählen zu denen diese Abfrage assoziiert werden soll.
TextSearch=Text-Suche
QuickSearch=Text-Suche
SearchAll=Alles suchen
@@ -828,7 +828,7 @@
SavedReportsList=Liste mit gespeicherten Abfrage
ReportInfo=Bericht-Information
SelectedUsers=Ausgewählte Benutzer
-ClickHereReportMessage=<a href="#add">Hier klicken</a> um Benutzer zum Zeileninhalt dieses Berichts hinzuzufügen
+ScrolldownReportMessage=<a href="#add">Herunterscrollen</a> um Benutzer zum Zeileninhalt dieses Berichts hinzuzufügen
DefineHeaderSelectionOptionsAndHeadingSummaryInstructions=Wählen Sie eine Überschrift und klicken dann auf die "{0}"-Schaltfläche. Dann, "{1}" um {2} zu setzen.
ReportUpdatedDoMore=Bericht wurde aktualisiert. Sie können jetzt mit dem bearbeiten der Überschrift fortfahren, indem Sie zum Beispiel die Optionen zu Gruppen kombinieren, andere Überschriften hinzufügen oder ändern, oder die anderern Achsen bearbeiten.
Modified: trunk/src/conf/classes/ScarabBundle_en.properties
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/conf/classes/ScarabBundle_en.properties?view=diff&pathrev=10866&r1=10865&r2=10866
==============================================================================
--- trunk/src/conf/classes/ScarabBundle_en.properties (original)
+++ trunk/src/conf/classes/ScarabBundle_en.properties 2010-01-20 04:58:48-0800
@@ -541,7 +541,7 @@
AssignUsersWithThisIssue=Associate users with {0,choice,1#this issue|2#these issues}
NoAssignableUserAttributes=There are no active user attributes to which to assign users.
AssociateUsersAndIssues=Please select an issue or issues with which to associate users.
-ClickHereToSelectUsers=<a href="#add">Click here</a> to select users to associate with {0,choice,1#this issue|2#these issues}
+ScrolldownToSelectUsersForQuery=<a href="#add">Scroll down</a> to select users to associate with {0,choice,1#this issue|2#these issues}
ChangesSavedOnDone=Changes are not saved to the issue until you select "Done"
PersonnelAssociatedWithIssue=Personnel associated with the issue {0}
IssueIdNotValid=The issue ID, {0}, is not valid.
@@ -587,7 +587,7 @@
AdvancedQuery=Advanced query
CustomQuery=Custom query
NoCustomSearch=There are no custom search attributes designated for this artifact type, so the advanced query screen is being shown instead.
-ClickHereToSelectUsersForQuery=<a href="#add">Click here</a> to select users to associate with this query.
+ScrolldownToSelectUsersForQuery=<a href="#add">Scroll down</a> to select users to associate with this query.
TextSearch=Text search
QuickSearch=Quick search
SearchAll=Search all
@@ -910,7 +910,7 @@
SavedReportsList=saved reports list
ReportInfo=Report information
SelectedUsers=Selected users
-ClickHereReportMessage=<a href="#add">Click here</a> to add users to this reports row content
+ScrolldownReportMessage=<a href="#add">Scroll down</a> to add users to this reports row content
DefineHeaderSelectionOptionsAndHeadingSummaryInstructions=Select a heading you wish to modify and click the "{0}" button. Then, "{1}" to set the {2}.
ReportUpdatedDoMore=Report was updated. You can continue editing this heading possibly combining the options into groups, add or modify other heading levels, or edit the other axis.
Modified: trunk/src/conf/classes/ScarabBundle_es.properties
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/conf/classes/ScarabBundle_es.properties?view=diff&pathrev=10866&r1=10865&r2=10866
==============================================================================
--- trunk/src/conf/classes/ScarabBundle_es.properties (original)
+++ trunk/src/conf/classes/ScarabBundle_es.properties 2010-01-20 04:58:48-0800
@@ -485,7 +485,7 @@
AssignUsersWithThisIssue = Asociar usuarios con {0,choice,1#esta petición|2#esas peticiones}
NoAssignableUserAttributes = No hay atrubutos de usuario activos a los que asignar.
AssociateUsersAndIssues = Selecciona una petición o peticiones a las que asociar usuarios.
-ClickHereToSelectUsers = <a href="#add">Pulsa aquí</a> para seleccionar usuarios a asociar con {0,choice,1#esta petición|2#estas peticiones}
+ScrolldownToSelectUsers = <a href="#add">Pulsa aquí</a> para seleccionar usuarios a asociar con {0,choice,1#esta petición|2#estas peticiones}
ChangesSavedOnDone = Los cambios no se guardarán hasta que pulses "Hecho"
PersonnelAssociatedWithIssue = Personal asociado con la petición {0}
IssueIdNotValid = El ID de petición, {0}, no es válido.
@@ -530,7 +530,7 @@
AdvancedQuery = Consulta avanzada
CustomQuery = Consulta a medida
NoCustomSearch = No se han determinado los atributos para la búsqueda personalizada, así que se muestra la pantalla de consulta avanzada.
-ClickHereToSelectUsersForQuery = <a href="#add">Pulsa aquí</a> para seleccionar usuarios que deben asociarse a esta consulta.
+ScrolldownToSelectUsersForQuery = <a href="#add">Pulsa aquí</a> para seleccionar usuarios que deben asociarse a esta consulta.
TextSearch = Búsqueda de texto
SearchAll = Buscar todo
EnterString = Introduce cadena de búsqueda
@@ -838,7 +838,7 @@
SavedReportsList = lista de informes guardados
ReportInfo = Información de informe
SelectedUsers = Usuarios seleccionados
-ClickHereReportMessage = <a href="#add">Pulsa aquí</a> para añadir usuarios al contenido de filas de este informe
+ScrolldownReportMessage = <a href="#add">Pulsa aquí</a> para añadir usuarios al contenido de filas de este informe
DefineHeaderSelectionOptionsAndHeadingSummaryInstructions = Selecciona la cabecera que quieres modificar y pulsa "{0}". Entonces, "{1}" para establecer el {2}.
ReportUpdatedDoMore = El informe se ha actualizado. Puedes continuar editando este encabezado, posiblemente combinando las opciones en grupos, añadiendo o modificando otros niveles de encabezado, o editar los otros ejes.
Modified: trunk/src/conf/classes/ScarabBundle_fr.properties
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/conf/classes/ScarabBundle_fr.properties?view=diff&pathrev=10866&r1=10865&r2=10866
==============================================================================
--- trunk/src/conf/classes/ScarabBundle_fr.properties (original)
+++ trunk/src/conf/classes/ScarabBundle_fr.properties 2010-01-20 04:58:48-0800
@@ -496,7 +496,7 @@
AssignUsersWithThisIssue = Associer des utilisateurs à {0,choice,1#cette fiche|2#ces fiches}
NoAssignableUserAttributes = Il n'y a pas d'attributs utilisateur actifs à qui assigner des utilisateurs.
AssociateUsersAndIssues = Veuillez sélectionner une ou plusieurs fiches pour y associer des utilisateurs.
-ClickHereToSelectUsers = <a href="#add">Cliquez ici</a> pour sélectionner des utilisateurs et les associer à {0,choice,1#cette fiche|2#ces fiches}
+ScrolldownToSelectUsers = <a href="#add">Cliquez ici</a> pour sélectionner des utilisateurs et les associer à {0,choice,1#cette fiche|2#ces fiches}
ChangesSavedOnDone = Les modifications ne sont pas enregistrées avant que vous ne cliquiez "Terminer"
PersonnelAssociatedWithIssue = Personnes associées à cette fiche {0}
IssueIdNotValid = L''ID de fiche, {0}, n''est pas valide.
@@ -542,7 +542,7 @@
AdvancedQuery = Requête avancée
CustomQuery = Requête personnalisée
NoCustomSearch = Il n'y a pas d'attributs personnalisés pour ce type d'artifact; c'est pourquoi vous accédez à l'écran de requête avancée.
-ClickHereToSelectUsersForQuery = <a href="#add">Cliquez ici</a> pour sélectionner des utilisateurs associés à cette requête.
+ScrolldownToSelectUsersForQuery = <a href="#add">Cliquez ici</a> pour sélectionner des utilisateurs associés à cette requête.
TextSearch = Recherche de texte
QuickSearch = Recherche rapide
SearchAll = Chercher tout
@@ -855,7 +855,7 @@
SavedReportsList = liste d'états enregistrés
ReportInfo = Infos sur l'état
SelectedUsers = Utilisateurs sélectionnés
-ClickHereReportMessage = <a href="#add">Cliquez ici</a> pour ajouter des utilisateurs aux lignes de cet état
+ScrolldownReportMessage = <a href="#add">Cliquez ici</a> pour ajouter des utilisateurs aux lignes de cet état
DefineHeaderSelectionOptionsAndHeadingSummaryInstructions = Sélectionnez une en-tête que vous désirez modifier et cliquez le bouton "{0}". Puis, "{1}" pour choisir le {2}.
ReportUpdatedDoMore = L'état a été mis à jour. Vous pouvez continuer à modifier cet en-tête, en combinant les options en groupe, en ajoutant ou modifiant d'autres niveaux d'en-tête ou en modifiant l'autre axe.
Modified: trunk/src/conf/classes/ScarabBundle_it.properties
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/conf/classes/ScarabBundle_it.properties?view=diff&pathrev=10866&r1=10865&r2=10866
==============================================================================
--- trunk/src/conf/classes/ScarabBundle_it.properties (original)
+++ trunk/src/conf/classes/ScarabBundle_it.properties 2010-01-20 04:58:48-0800
@@ -458,7 +458,7 @@
AssignUsersWithThisIssue=Utenti associati con {0,choice,1#questa segnalazione|2#queste segnalazioni}
NoAssignableUserAttributes=Non ci sono attributi utenti attivi ai queali assegnare utenti.
AssociateUsersAndIssues=Seleziona una o più segnalazioni alle quali associare utenti.
-ClickHereToSelectUsers=<a href="#add">Clicca qui</a> per selezionare utenti da associare a {0,choice,1#questa segnalazione|2#queste segnalazioni}
+ScrolldownToSelectUsers=<a href="#add">Clicca qui</a> per selezionare utenti da associare a {0,choice,1#questa segnalazione|2#queste segnalazioni}
ChangesSavedOnDone=I cambiamenti non vengono salvati finchè non si selezione "Concluso"
PersonnelAssociatedWithIssue=Staff associato alla segnalazione {0}
IssueIdNotValid=La segnalazione ID, {0}, non è valida.
@@ -501,7 +501,7 @@
AdvancedQuery=Interrogazione avanzata
CustomQuery=Interrogazione personalizzata
NoCustomSearch=Non ci sono attributi personalizzati per questo tipo, verrà visualizzata l'interfaccia avanzata d'interrrogazione.
-ClickHereToSelectUsersForQuery=<a href="#add">Clicca qui</a> per selezionari gli utenti da associare a questa interrogazione.
+ScrolldownToSelectUsersForQuery=<a href="#add">Clicca qui</a> per selezionari gli utenti da associare a questa interrogazione.
TextSearch=Ricerca testuale
SearchAll=Ricerca tutto
EnterString=Inserire la stringa di ricerca
@@ -804,7 +804,7 @@
SavedReportsList=elenco report salvati
ReportInfo=Informazioni sul report
SelectedUsers=Utenti selezionati
-ClickHereReportMessage=<a href="#add">Clicca qui</a> per aggiungere utenti al contenuto del report
+ScrolldownReportMessage=<a href="#add">Clicca qui</a> per aggiungere utenti al contenuto del report
DefineHeaderSelectionOptionsAndHeadingSummaryInstructions=Seleziona l''intestazione che desideri modificare e clicca il bottone "{0}". Quindi, "{1}" per impostare {2}.
ReportUpdatedDoMore=Il report è stato aggiornato. Puoi continuare a modificare il report magari combinando le opzioni in gruppi, aggiungendo o modificando altri livelli di intestazione o modificando l'altro asse del report.
Modified: trunk/src/conf/classes/ScarabBundle_ja.properties
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/conf/classes/ScarabBundle_ja.properties?view=diff&pathrev=10866&r1=10865&r2=10866
==============================================================================
--- trunk/src/conf/classes/ScarabBundle_ja.properties (original)
+++ trunk/src/conf/classes/ScarabBundle_ja.properties 2010-01-20 04:58:48-0800
@@ -396,7 +396,7 @@
AssignUsersWithThisIssue={0,choice,1#\u3053\u306e|2#\u3053\u308c\u3089\u306e}\u6848\u4ef6\u306b\u30e6\u30fc\u30b6\u3092\u95a2\u9023\u3065\u3051\u308b
NoAssignableUserAttributes=\u30a2\u30b5\u30a4\u30f3\u53ef\u80fd\u306a\u30e6\u30fc\u30b6\u5c5e\u6027\u304c\u3042\u308a\u307e\u305b\u3093\u3002
AssociateUsersAndIssues=\u6848\u4ef6\u304b\u30e6\u30fc\u30b6\u3092\u95a2\u9023\u3055\u305b\u308b\u6848\u4ef6\u3092\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044\u3002
-ClickHereToSelectUsers={0,choice,1#\u3053\u306e|2#\u3053\u308c\u3089\u306e}\u6848\u4ef6\u306b\u95a2\u4fc2\u4ed8\u3051\u308b\u30e6\u30fc\u30b6\u3092\u9078\u629e\u3059\u308b\u306b\u306f<a href="#add">\u3053\u3053\u3092\u30af\u30ea\u30c3\u30af</a>\u3057\u307e\u3059
+ScrolldownToSelectUsers={0,choice,1#\u3053\u306e|2#\u3053\u308c\u3089\u306e}\u6848\u4ef6\u306b\u95a2\u4fc2\u4ed8\u3051\u308b\u30e6\u30fc\u30b6\u3092\u9078\u629e\u3059\u308b\u306b\u306f<a href="#add">\u3053\u3053\u3092\u30af\u30ea\u30c3\u30af</a>\u3057\u307e\u3059
ChangesSavedOnDone="\u5b8c\u4e86"\u3092\u30af\u30ea\u30c3\u30af\u3059\u308b\u307e\u3067\u5909\u66f4\u306f\u4fdd\u5b58\u3055\u308c\u307e\u305b\u3093
PersonnelAssociatedWithIssue=\u6848\u4ef6 {0} \u306b\u30a2\u30b5\u30a4\u30f3\u3055\u308c\u3066\u3044\u308b\u30e6\u30fc\u30b6
IssueIdNotValid=\u6848\u4ef6ID, {0} , \u306f\u6709\u52b9\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002
@@ -436,7 +436,7 @@
AdvancedQuery=\u9ad8\u5ea6\u306a\u691c\u7d22
CustomQuery=\u30ab\u30b9\u30bf\u30e0\u691c\u7d22
NoCustomSearch=\u30ab\u30b9\u30bf\u30e0\u691c\u7d22\u306b\u542b\u3081\u3089\u308c\u305f\u5c5e\u6027\u304c\u6307\u5b9a\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002\u4ee3\u308f\u308a\u306b\u9ad8\u5ea6\u306a\u691c\u7d22\u753b\u9762\u3092\u8868\u793a\u3057\u307e\u3059\u3002
-ClickHereToSelectUsersForQuery=<a href="#add">\u3053\u3053\u3092\u30af\u30ea\u30c3\u30af</a> \u3059\u308b\u3068\u3053\u306e\u691c\u7d22\u306b\u95a2\u9023\u30e6\u30fc\u30b6\u3092\u6307\u5b9a\u3057\u307e\u3059\u3002
+ScrolldownToSelectUsersForQuery=<a href="#add">\u3053\u3053\u3092\u30af\u30ea\u30c3\u30af</a> \u3059\u308b\u3068\u3053\u306e\u691c\u7d22\u306b\u95a2\u9023\u30e6\u30fc\u30b6\u3092\u6307\u5b9a\u3057\u307e\u3059\u3002
TextSearch=\u30c6\u30ad\u30b9\u30c8\u691c\u7d22
SearchAll=\u5168\u4ef6\u691c\u7d22
EnterString=\u691c\u7d22\u6587\u5b57\u5217\u5165\u529b
@@ -740,7 +740,7 @@
SavedReportsList=\u4fdd\u5b58\u3055\u308c\u305f\u30ec\u30dd\u30fc\u30c8\u306e\u4e00\u89a7
ReportInfo=\u30ec\u30dd\u30fc\u30c8\u60c5\u5831
SelectedUsers=\u9078\u629e\u3055\u308c\u305f\u30e6\u30fc\u30b6
-ClickHereReportMessage=<a href="#add">\u3053\u3053\u3092\u30af\u30ea\u30c3\u30af</a> \u3059\u308b\u3068\u3001\u3053\u306e\u30ec\u30dd\u30fc\u30c8\u306e\u5217\u306b\u30e6\u30fc\u30b6\u3092\u8ffd\u52a0\u3057\u307e\u3059\u3002
+ScrolldownReportMessage=<a href="#add">\u3053\u3053\u3092\u30af\u30ea\u30c3\u30af</a> \u3059\u308b\u3068\u3001\u3053\u306e\u30ec\u30dd\u30fc\u30c8\u306e\u5217\u306b\u30e6\u30fc\u30b6\u3092\u8ffd\u52a0\u3057\u307e\u3059\u3002
DefineHeaderSelectionOptionsAndHeadingSummaryInstructions=\u7de8\u96c6\u3057\u305f\u3044\u898b\u51fa\u3057\u3092\u9078\u629e\u3057\u3066 "{0}" \u30dc\u30bf\u30f3\u3092\u30af\u30ea\u30c3\u30af\u3057\u307e\u3059\u3002\u305d\u308c\u304b\u3089\u3001 "{1}" \u3092\u8a2d\u5b9a\u3057\u3066\u3001\u6b21\u306e\u30aa\u30d7\u30b7\u30e7\u30f3\u3092\u6c7a\u3081\u307e\u3059\uff1a {2}.
ReportUpdatedDoMore=\u30ec\u30dd\u30fc\u30c8\u306f\u66f4\u65b0\u3055\u308c\u307e\u3057\u305f\u3002\u3053\u306e\u898b\u51fa\u3057\u3092\u66f4\u306b\u7de8\u96c6\u3057\u305f\u308a\u3001\u307e\u305f\u30aa\u30d7\u30b7\u30e7\u30f3\u3092\u30b0\u30eb\u30fc\u30d7\u3068\u3057\u3066\u7d44\u307f\u5408\u308f\u305b\u3066\u3053\u306e\u898b\u51fa\u3057\u306e\u7de8\u96c6\u3092\u7d9a\u884c\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002\u307e\u305f\u3001\u5225\u306e\u30ec\u30d9\u30eb\u306e\u898b\u51fa\u3057\u3092\u8ffd\u52a0\u30fb\u4fee\u6b63\u3059\u308b\u3053\u3068\u3082\u3067\u304d\u307e\u3059\u3057\u3001\u5225\u306e\u8ef8\u306e\u7de8\u96c6\u3092\u3059\u308b\u3053\u3068\u3082\u3067\u304d\u307e\u3059\u3002
Modified: trunk/src/conf/classes/ScarabBundle_ko.properties
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/conf/classes/ScarabBundle_ko.properties?view=diff&pathrev=10866&r1=10865&r2=10866
==============================================================================
--- trunk/src/conf/classes/ScarabBundle_ko.properties (original)
+++ trunk/src/conf/classes/ScarabBundle_ko.properties 2010-01-20 04:58:48-0800
@@ -409,7 +409,7 @@
AssignUsersWithThisIssue = [ko]Associate users with {0,choice,1#this issue|2#these issues}
NoAssignableUserAttributes = [ko]There are no active user attributes to which to assign users.
AssociateUsersAndIssues = [ko]Please select an issue or issues with which to associate users.
-ClickHereToSelectUsers = <a href="#add">Click here</a> to select users to associate with {0,choice,1#this issue|2#these issues}
+ScrolldownToSelectUsers = <a href="#add">Scroll down</a> to select users to associate with {0,choice,1#this issue|2#these issues}
ChangesSavedOnDone = Changes are not saved to the issue until you select "Done"
PersonnelAssociatedWithIssue = [ko]Personnel associated with the issue {0}
IssueIdNotValid = [ko]The issue Id, {0}, is not valid.
@@ -449,7 +449,7 @@
AdvancedQuery = Advanced query
CustomQuery = Custom query
NoCustomSearch = There are no custom search attributes designated for this artifact type, so the advanced query screen is being shown instead.
-ClickHereToSelectUsersForQuery = <a href="#add">Click here</a> to select users to associate with this query.
+ScrolldownToSelectUsersForQuery = <a href="#add">Scroll down</a> to select users to associate with this query.
TextSearch = [ko]Text search
SearchAll = \uc804\uccb4 \uac80\uc0c9
EnterString = [ko]Enter search string
@@ -751,7 +751,7 @@
SavedReportsList = [ko]saved reports list
ReportInfo = [ko]Report information
SelectedUsers = Selected users
-ClickHereReportMessage = <a href="#add">Click here</a> to add users to this reports row content
+ScrolldownReportMessage = <a href="#add">Scroll down</a> to add users to this reports row content
DefineHeaderSelectionOptionsAndHeadingSummaryInstructions = Select a heading you wish to modify and click the "{0}" button. Then, "{1}" to set the {2}.
ReportUpdatedDoMore = Report was updated. You can continue editing this heading possibly combining the options into groups, add or modify other heading levels, or edit the other axis.
Modified: trunk/src/conf/classes/ScarabBundle_nl.properties
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/conf/classes/ScarabBundle_nl.properties?view=diff&pathrev=10866&r1=10865&r2=10866
==============================================================================
--- trunk/src/conf/classes/ScarabBundle_nl.properties (original)
+++ trunk/src/conf/classes/ScarabBundle_nl.properties 2010-01-20 04:58:48-0800
@@ -384,7 +384,7 @@
AssignUsersWithThisIssue = Associeer gebruikers met {0,choice,1#deze kaart|2#deze kaarten}
NoAssignableUserAttributes = Er zijn geen actieve gebruiker attributen waaraan gebruikers gekoppeld kunnen worden.
AssociateUsersAndIssues = Selecteer een kaart of kaarten waaraan gebruikers te koppelen.
-ClickHereToSelectUsers = <a href="#add">klik hier</a> om gebruikers te selecteren om te koppelen met {0,choice,1#deze kaart|2#deze kaarten}
+ScrolldownToSelectUsers = <a href="#add">klik hier</a> om gebruikers te selecteren om te koppelen met {0,choice,1#deze kaart|2#deze kaarten}
ChangesSavedOnDone = Wijzigingen worden niet opgeslagen voordat de "Opslaan" knop ingedrukt wordt.
PersonnelAssociatedWithIssue = Personen geassocieerd met de kaart {0}
IssueIdNotValid = De kaart-ID, {0}, is ongeldig.
@@ -423,7 +423,7 @@
AdvancedQuery = Uitgebreide zoekopdracht
CustomQuery = Aangepaste zoekopdracht
NoCustomSearch = Er zijn geen aangepaste zoek attributen voor deze artifact soort, dus het uitgebreide zoekopdracht scherm wordt in plaats daarvan getoond.
-ClickHereToSelectUsersForQuery = <a href="#add">Klik hier</a> om gebruikers te selecteren en te associeren met deze zoekopdracht.
+ScrolldownToSelectUsersForQuery = <a href="#add">Klik hier</a> om gebruikers te selecteren en te associeren met deze zoekopdracht.
TextSearch = Zoek in tekst
SearchAll = Doorzoek alles
EnterString = Geef zoektekst
@@ -720,7 +720,7 @@
SavedReportsList = opgeslagen overzichten lijst
ReportInfo = Overzicht informatie
SelectedUsers = Geselecteerde gebruikers
-ClickHereReportMessage = <a href="#add">klik hier</a> om gebruikers toe te voegen aan deze overzichten rij inhoud
+ScrolldownReportMessage = <a href="#add">klik hier</a> om gebruikers toe te voegen aan deze overzichten rij inhoud
DefineHeaderSelectionOptionsAndHeadingSummaryInstructions = Selecteer een kop welke u wilt wijzigen en klik op de "{0}" knop. Dan, "{1}" om de {2} in te stellen.
ReportUpdatedDoMore = Overzicht is bijgewerkt. U kan doorgaan met het wijzigen van deze koppen en mogelijk groeperen van de opties, toevoegen of wijzigen van andere koppen, of wijzig de andere as.
Modified: trunk/src/conf/classes/ScarabBundle_pl.properties
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/conf/classes/ScarabBundle_pl.properties?view=diff&pathrev=10866&r1=10865&r2=10866
==============================================================================
--- trunk/src/conf/classes/ScarabBundle_pl.properties (original)
+++ trunk/src/conf/classes/ScarabBundle_pl.properties 2010-01-20 04:58:48-0800
@@ -506,7 +506,7 @@
AssignUsersWithThisIssue=U\u017cytkownicy powi\u0105zani z {0,choice,1#tym zagadnieniem|2#tymi zagadnieniami}
NoAssignableUserAttributes=Brak aktywnych atrybut\u00f3w wykorzystywanych do przyporz\u0105dkowywania u\u017cytkownik\u00f3w.
AssociateUsersAndIssues=Prosz\u0119 wybierz zagadnienie lub zagadnienia, z kt\u00f3rymi chcesz po\u0142aczy\u0107 u\u017cytkownik\u00f3w.
-ClickHereToSelectUsers=<a href="#add">Kliknij tutaj</a> by wybra\u0107 u\u017cytkownik\u00f3w do przypisania do {0,choice,1#tego zagadnienia|2#tych zagadnie\u0144}
+ScrolldownToSelectUsers=<a href="#add">Kliknij tutaj</a> by wybra\u0107 u\u017cytkownik\u00f3w do przypisania do {0,choice,1#tego zagadnienia|2#tych zagadnie\u0144}
ChangesSavedOnDone=Zmiany nie zostan\u0105 zapisane dop\u00f3ty, dok\u00f3pki nie klikniesz "Gotowe".
PersonnelAssociatedWithIssue=Personel powi\u0105zany z zagadnieniem {0}
IssueIdNotValid=ID zagadnienia {0}, nie jest poprawne.
@@ -552,7 +552,7 @@
AdvancedQuery=Zaawansowana kwerenda
CustomQuery=Prosta kwerenda
NoCustomSearch=There are no custom search attributes designated for this artifact type, so the advanced query screen is being shown instead.
-ClickHereToSelectUsersForQuery=<a href="#add">Kliknij tutaj</a> aby wybra\u0107 u\u017cytkownik\u00f3w zwi\u0105zanych z t\u0105 kwerend\u0105.
+ScrolldownToSelectUsersForQuery=<a href="#add">Kliknij tutaj</a> aby wybra\u0107 u\u017cytkownik\u00f3w zwi\u0105zanych z t\u0105 kwerend\u0105.
TextSearch=Tekstowe wyszukiwanie
QuickSearch=Szybkie wyszukiwanie
SearchAll=Search all
@@ -867,7 +867,7 @@
SavedReportsList=listy zapisanych raport\u00f3w
ReportInfo=Report information
SelectedUsers=Selected users
-ClickHereReportMessage=<a href="#add">Click here</a> to add users to this reports row content
+ScrolldownReportMessage=<a href="#add">Scroll down</a> to add users to this reports row content
DefineHeaderSelectionOptionsAndHeadingSummaryInstructions=Select a heading you wish to modify and click the "{0}" button. Then, "{1}" to set the {2}.
ReportUpdatedDoMore=Raport zosta\u0142 zaktualizowany. You can continue editing this heading possibly combining the options into groups, add or modify other heading levels, or edit the other axis.
Modified: trunk/src/conf/classes/ScarabBundle_pt_BR.properties
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/conf/classes/ScarabBundle_pt_BR.properties?view=diff&pathrev=10866&r1=10865&r2=10866
==============================================================================
--- trunk/src/conf/classes/ScarabBundle_pt_BR.properties (original)
+++ trunk/src/conf/classes/ScarabBundle_pt_BR.properties 2010-01-20 04:58:48-0800
@@ -386,7 +386,7 @@
AssignUsersWithThisIssue=Associar usuários com {0,choice,1#este item|2#estes ítens}
NoAssignableUserAttributes=Não há nenhum atributo de usuário ativo para associado usuários.
AssociateUsersAndIssues=Por favor selecione um item ou ítens com o qual possam ser associar usuários ao mesmo.
-ClickHereToSelectUsers=<a href="#add">Clique aqui</a> para selecionar usuários para associar {0,choice,1#este item|2#estes ítens}
+ScrolldownToSelectUsers=<a href="#add">Clique aqui</a> para selecionar usuários para associar {0,choice,1#este item|2#estes ítens}
ChangesSavedOnDone=As mudanças não são salvas para o ítem até que você selecione "Pronto"
PersonnelAssociatedWithIssue=Pessoas associadas com este item {0}
IssueIdNotValid=O código de item {0} não é válido.
@@ -426,7 +426,7 @@
AdvancedQuery=Consulta avançada
CustomQuery=Consulta personalizada
NoCustomSearch=O dono do projeto não definiu campos de busca, então a consulta avançada não está sendo mostrada.
-ClickHereToSelectUsersForQuery=<a href="#add">Clique aqui</a> para selecionar usuários para associar com esta consulta.
+ScrolldownToSelectUsersForQuery=<a href="#add">Clique aqui</a> para selecionar usuários para associar com esta consulta.
TextSearch=Busca de Texto
SearchAll=Buscar tudo
EnterString=Cadastrar frase de busca
@@ -728,7 +728,7 @@
SavedReportsList=lista de relatórios salvos
ReportInfo=Informação do relatório
SelectedUsers=Usuários selecionados
-ClickHereReportMessage=<a href="#add">Clique aqui</a> para adicionar usuários para o conteúdo das linha do relatório
+ScrolldownReportMessage=<a href="#add">Clique aqui</a> para adicionar usuários para o conteúdo das linha do relatório
DefineHeaderSelectionOptionsAndHeadingSummaryInstructions=Selecione um cabeçalho que deseje para modificar e clique no btão "{0}". Depois, "{1}" para ajustar o {2}.
ReportUpdatedDoMore=O relatório foi atualizado. Você pode continuar alterando este cabeçalho possivelmente combinando as opções em grupos, acrescentar ou modificar outros níveis de cabeçalhos ou alterar os outros eixos.
Modified: trunk/src/conf/classes/ScarabBundle_ru.properties
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/conf/classes/ScarabBundle_ru.properties?view=diff&pathrev=10866&r1=10865&r2=10866
==============================================================================
--- trunk/src/conf/classes/ScarabBundle_ru.properties (original)
+++ trunk/src/conf/classes/ScarabBundle_ru.properties 2010-01-20 04:58:48-0800
@@ -577,11 +577,11 @@
ClickHere = \u041D\u0430\u0436\u043C\u0438\u0442\u0435 \u0441\u044E\u0434\u0430
-ClickHereReportMessage = <a href="#add">Click here</a> to add users to this reports row content
+ScrolldownReportMessage = <a href="#add">Scroll down</a> to add users to this reports row content
-ClickHereToSelectUsers = <a href="#add">\u041D\u0430\u0436\u043C\u0438\u0442\u0435 \u0441\u044E\u0434\u0430</a> \u0447\u0442\u043E\u0431\u044B \u0432\u044B\u0431\u0440\u0430\u0442\u044C \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u0435\u0439 \u0447\u0442\u043E\u0431\u044B \u0430\u0441\u0441\u043E\u0446\u0438\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0441 {0,choice,1#\u044D\u0442\u043E\u0439 \u043F\u0440\u043E\u0431\u043B\u0435\u043C\u043E\u0439|2#\u044D\u0442\u0438\u043C\u0438 \u043F\u0440\u043E\u0431\u043B\u0435\u043C\u0430\u043C\u0438}
+ScrolldownToSelectUsers = <a href="#add">\u041D\u0430\u0436\u043C\u0438\u0442\u0435 \u0441\u044E\u0434\u0430</a> \u0447\u0442\u043E\u0431\u044B \u0432\u044B\u0431\u0440\u0430\u0442\u044C \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u0435\u0439 \u0447\u0442\u043E\u0431\u044B \u0430\u0441\u0441\u043E\u0446\u0438\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0441 {0,choice,1#\u044D\u0442\u043E\u0439 \u043F\u0440\u043E\u0431\u043B\u0435\u043C\u043E\u0439|2#\u044D\u0442\u0438\u043C\u0438 \u043F\u0440\u043E\u0431\u043B\u0435\u043C\u0430\u043C\u0438}
-ClickHereToSelectUsersForQuery = <a href="#add">\u041D\u0430\u0436\u043C\u0438\u0442\u0435 \u0441\u044E\u0434\u0430</a> \u0447\u0442\u043E\u0431\u044B \u0432\u044B\u0431\u0440\u0430\u0442\u044C \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u0435\u0439 \u0434\u043B\u044F \u0430\u0441\u0441\u043E\u0446\u0438\u0430\u0446\u0438\u0438 \u0441 \u044D\u0442\u0438\u043C \u0437\u0430\u043F\u0440\u043E\u0441\u043E\u043C.
+ScrolldownToSelectUsersForQuery = <a href="#add">\u041D\u0430\u0436\u043C\u0438\u0442\u0435 \u0441\u044E\u0434\u0430</a> \u0447\u0442\u043E\u0431\u044B \u0432\u044B\u0431\u0440\u0430\u0442\u044C \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u0435\u0439 \u0434\u043B\u044F \u0430\u0441\u0441\u043E\u0446\u0438\u0430\u0446\u0438\u0438 \u0441 \u044D\u0442\u0438\u043C \u0437\u0430\u043F\u0440\u043E\u0441\u043E\u043C.
ClickThe = Click the
Modified: trunk/src/conf/classes/ScarabBundle_zh_CN.properties
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/conf/classes/ScarabBundle_zh_CN.properties?view=diff&pathrev=10866&r1=10865&r2=10866
==============================================================================
--- trunk/src/conf/classes/ScarabBundle_zh_CN.properties (original)
+++ trunk/src/conf/classes/ScarabBundle_zh_CN.properties 2010-01-20 04:58:48-0800
@@ -398,7 +398,7 @@
AssignUsersWithThisIssue = \u4e3a {0,choice,1#this issue|2#these issues} \u6848\u4ef6\u5206\u914d\u5904\u7406\u4eba
NoAssignableUserAttributes = \u6ca1\u6709\u4f9b\u5206\u6d3e\u7684\u7528\u6237\u3002
AssociateUsersAndIssues = \u8bf7\u9009\u62e9\u4e0e\u8fd9\u4e9b\u7528\u6237\u76f8\u5173\u7684\u6848\u4ef6\u3002
-ClickHereToSelectUsers = <a href="#add">\u70b9\u51fb\u8fd9\u91cc</a>\u9009\u6848\u4ef6 {0,choice,1#this issue|2#these issues}\u7684\u5904\u7406\u4eba
+ScrolldownToSelectUsers = <a href="#add">\u70b9\u51fb\u8fd9\u91cc</a>\u9009\u6848\u4ef6 {0,choice,1#this issue|2#these issues}\u7684\u5904\u7406\u4eba
ChangesSavedOnDone = \u6309\u4e0b[\u5b8c\u6210] \u4ee5\u4fdd\u5b58\u6848\u4ef6\u53d1\u751f\u7684\u53d8\u66f4
PersonnelAssociatedWithIssue = \u6848\u4ef6{0}\u5904\u7406\u4eba
IssueIdNotValid = \u6848\u4ef6ID{0}\u65e0\u6548\u3002
@@ -441,7 +441,7 @@
AdvancedQuery = Advanced query
CustomQuery = Custom query
NoCustomSearch = \u5bf9\u4e8e\u8fd9\u4e2a\u4eba\u5de5\u5b9a\u4e49\u7684\u7c7b\u578b\uff0c\u6ca1\u6709\u81ea\u5b9a\u4e49\u7684\u67e5\u8be2\u5c5e\u6027, \u5c06\u663e\u793a\u9ad8\u7ea7\u67e5\u8be2\u754c\u9762\u3002
-ClickHereToSelectUsersForQuery = <a href="#add">\u70b9\u51fb\u8fd9\u91cc</a> \u9009\u62e9\u6b64\u67e5\u8be2\u5173\u8054\u7684\u7528\u6237\u3002
+ScrolldownToSelectUsersForQuery = <a href="#add">\u70b9\u51fb\u8fd9\u91cc</a> \u9009\u62e9\u6b64\u67e5\u8be2\u5173\u8054\u7684\u7528\u6237\u3002
TextSearch = \u6b63\u6587\u641c\u7d22
SearchAll = \u67e5\u627e\u5168\u90e8
EnterString = \u8f93\u5165\u67e5\u8be2\u5b57\u7b26\u4e32
@@ -750,7 +750,7 @@
SavedReportsList = \u4fdd\u5b58\u7684\u62a5\u544a\u5217\u8868
ReportInfo = \u62a5\u544a\u4fe1\u606f
SelectedUsers = \u9009\u4e2d\u7528\u6237
-ClickHereReportMessage = <a href="#add">\u70b9\u51fb\u8fd9\u91cc</a>\u5c06\u7528\u6237\u589e\u52a0\u5230\u62a5\u544a\u884c\u5185\u5bb9\u4e2d
+ScrolldownReportMessage = <a href="#add">\u70b9\u51fb\u8fd9\u91cc</a>\u5c06\u7528\u6237\u589e\u52a0\u5230\u62a5\u544a\u884c\u5185\u5bb9\u4e2d
DefineHeaderSelectionOptionsAndHeadingSummaryInstructions = Select a heading you wish to modify and click the "{0}" button. Then, "{1}" to set the {2}.
ReportUpdatedDoMore = \u62a5\u544a\u88ab\u4fee\u6539\u3002\u53ef\u4ee5\u7ee7\u7eed\u4fee\u6539\u6807\u9898\uff0c\u8bbe\u8ba1\u7ec4\u53ca\u7f16\u8f91\u5176\u4ed6\u5ea7\u6807\u8f74\u3002
Modified: trunk/src/conf/classes/ScarabBundle_zh_TW.properties
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/conf/classes/ScarabBundle_zh_TW.properties?view=diff&pathrev=10866&r1=10865&r2=10866
==============================================================================
--- trunk/src/conf/classes/ScarabBundle_zh_TW.properties (original)
+++ trunk/src/conf/classes/ScarabBundle_zh_TW.properties 2010-01-20 04:58:48-0800
@@ -449,7 +449,7 @@
AssignUsersWithThisIssue=Associate users with {0,choice,1#this issue|2#these issues}
NoAssignableUserAttributes=There are no active user attributes to which to assign users.
AssociateUsersAndIssues=\u8acb\u9078\u64c7\u8b70\u984c\u4e88\u76f8\u95dc\u4eba\u54e1.
-ClickHereToSelectUsers=<a href="#add">Click here</a> to select users to associate with {0,choice,1#this issue|2#these issues}
+ScrolldownToSelectUsers=<a href="#add">Click here</a> to select users to associate with {0,choice,1#this issue|2#these issues}
ChangesSavedOnDone=Changes are not saved to the issue until you select "Done"
PersonnelAssociatedWithIssue=\u6b64\u8b70\u984c\u76f8\u95dc\u4eba\u54e1 {0}
IssueIdNotValid=\u6b64\u8b70\u984c ID {0} \u662f\u7121\u6548\u7684.
@@ -492,7 +492,7 @@
AdvancedQuery=\u9032\u968e\u67e5\u8a62
CustomQuery=\u5ba2\u88fd\u67e5\u8a62
NoCustomSearch=There are no custom search attributes designated for this artifact type, so the advanced query screen is being shown instead.
-ClickHereToSelectUsersForQuery=<a href="#add">Click here</a> to select users to associate with this query.
+ScrolldownToSelectUsersForQuery=<a href="#add">Click here</a> to select users to associate with this query.
TextSearch=\u5168\u6587\u6aa2\u7d22
SearchAll=\u5168\u9078
EnterString=\u8f38\u5165\u6b32\u67e5\u8a62\u7684\u5b57\u4e32Enter search string
@@ -795,7 +795,7 @@
SavedReportsList=saved reports list
ReportInfo=Report information
SelectedUsers=Selected users
-ClickHereReportMessage=<a href="#add">Click here</a> to add users to this reports row content
+ScrolldownReportMessage=<a href="#add">Scroll down</a> to add users to this reports row content
DefineHeaderSelectionOptionsAndHeadingSummaryInstructions=Select a heading you wish to modify and click the "{0}" button. Then, "{1}" to set the {2}.
ReportUpdatedDoMore=Report was updated. You can continue editing this heading possibly combining the options into groups, add or modify other heading levels, or edit the other axis.
Modified: trunk/src/java/org/tigris/scarab/om/Activity.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/om/Activity.java?view=diff&pathrev=10866&r1=10865&r2=10866
==============================================================================
--- trunk/src/java/org/tigris/scarab/om/Activity.java (original)
+++ trunk/src/java/org/tigris/scarab/om/Activity.java 2010-01-20 04:58:48-0800
@@ -208,15 +208,37 @@
* @throws Exception
*/
public String getOldValue(ScarabLocalizationTool l10n)
+ throws Exception
+ {
+ return getOldValue(null, l10n);
+ }
+
+ /**
+ * Returns old value, before activity took place.
+ * @param issue : Instance of current issue. Is used to evaluate dependency type.
+ * @param l10n : Instance of localization.
+ * @return : Old value.
+ * @throws Exception
+ */
+ public String getOldValue(Issue issue, ScarabLocalizationTool l10n)
throws Exception
{
String value = null;
if( getType().equals(ActivityType.DEPENDENCY_DELETED)
|| getType().equals(ActivityType.DEPENDENCY_CHANGED))
{
- value = getDepend().getIssueRelatedByObserverId().getUniqueId()
- + " " + l10n.get(DependTypeManager.getManager().getL10nKey(getOldValue()))
- + " " + getDepend().getIssueRelatedByObservedId().getUniqueId();
+ if(issue != null
+ && issue.getIssueId().intValue() != getDepend().getIssueRelatedByObservedId().getIssueId().intValue()
+ && getOldValue().equals("blocking")){
+ value = getDepend().getIssueRelatedByObserverId().getUniqueId()
+ + " " + l10n.get("DependsOn") //deprecated, but method is used many times in scarab.
+ + " " + getDepend().getIssueRelatedByObservedId().getUniqueId();
+ }
+ else{
+ value = getDepend().getIssueRelatedByObservedId().getUniqueId()
+ + " " + (getOldValue().equals("blocking") ? l10n.get("PrerequisiteFor") : l10n.get(DependTypeManager.getManager().getL10nKey(getOldValue())))
+ + " " + getDepend().getIssueRelatedByObserverId().getUniqueId();
+ }
} else if( getType().equals(ActivityType.ATTACHMENT_REMOVED))
{
value = getAttachment().getFileName();
@@ -240,21 +262,42 @@
}
/**
- * Returns new value, after activity took place.
+ * Returns new value, for activity.
+ * @param l10n
+ * @return New value.
+ * @throws Exception
+ */
+ public String getNewValue(ScarabLocalizationTool l10n) throws Exception{
+ return getNewValue(null, l10n);
+ }
+
+ /**
+ * Returns new value, for activity.
+ * @param issue : Instance of current issue.
* @param l10n : Instance of localization.
* @return : New value.
* @throws Exception
*/
- public String getNewValue(ScarabLocalizationTool l10n)
+ public String getNewValue(Issue issue, ScarabLocalizationTool l10n)
throws Exception
{
String value = null;
if( getType().equals(ActivityType.DEPENDENCY_CREATED)
|| getType().equals(ActivityType.DEPENDENCY_CHANGED))
{
- value = getDepend().getIssueRelatedByObserverId().getUniqueId()
- + " " + l10n.get(DependTypeManager.getManager().getL10nKey(getNewValue()))
- + " " + getDepend().getIssueRelatedByObservedId().getUniqueId();
+ if(issue != null
+ && issue.getIssueId().intValue() != getDepend().getIssueRelatedByObservedId().getIssueId().intValue()
+ && getNewValue().equals("blocking")){
+ value = getDepend().getIssueRelatedByObserverId().getUniqueId()
+ + " " + l10n.get("DependsOn") //deprecated, but method is used many times in scarab.
+ + " " + getDepend().getIssueRelatedByObservedId().getUniqueId();
+ }
+ else{
+ value = getDepend().getIssueRelatedByObservedId().getUniqueId()
+ + " " + (getNewValue().equals("blocking") ? l10n.get("PrerequisiteFor") : l10n.get(DependTypeManager.getManager().getL10nKey(getNewValue())))
+ + " " + getDepend().getIssueRelatedByObserverId().getUniqueId();
+ }
+
} else if( getType().equals(ActivityType.ATTACHMENT_CREATED))
{
value = getAttachment().getFileName();
@@ -311,6 +354,13 @@
{
name = l10n.get(L10NKeySet.Comment);
}
+ else if( getType().equals(ActivityType.ISSUE_COPIED)
+ || getType().equals(ActivityType.ISSUE_MOVED)
+ || getType().equals(ActivityType.ISSUE_CREATED)
+ || getType().equals(ActivityType.ISSUE_DELETED))
+ {
+ name = l10n.get(L10NKeySet.IssueId);
+ }
return name;
}
Modified: trunk/src/java/org/tigris/scarab/screens/ViewIssue.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/screens/ViewIssue.java?view=diff&pathrev=10866&r1=10865&r2=10866
==============================================================================
--- trunk/src/java/org/tigris/scarab/screens/ViewIssue.java (original)
+++ trunk/src/java/org/tigris/scarab/screens/ViewIssue.java 2010-01-20 04:58:48-0800
@@ -88,8 +88,12 @@
Issue issue = null;
String id = data.getParameters().getString("id");
- issue = getReferredIssue(id == null ? null : id.trim(), (ScarabModule)scarabR.getCurrentModule());
-
+ try{
+ issue = getReferredIssue(id == null ? null : id.trim(), (ScarabModule)scarabR.getCurrentModule());
+ }
+ catch(Exception e){
+ //ignore, this case will be handled later: issue == null
+ }
boolean hasViewPermission = false;
boolean hasDeletePermission = false;
// Deleted issues will appear to not have existed before
@@ -144,26 +148,15 @@
}
}
- if (module != null)
- { // Will prefix with module's code if ID is just a number
- if(!idCount.toString().equals(id)){
- if(module.getCode().concat(idCount.toString()).equals(id)){
- //id is full qualified issue id (includes prefix)
- issue = IssueManager.getIssueById(id);
- }
- else{
- //invalid suffix in issue id
- issue = null;
- }
- }
- else{
- //id is number only
- issue = IssueManager.getIssueById(id, module.getCode());
- }
-
+ if(!idCount.toString().equals(id)){
+ issue = IssueManager.getIssueById(id);
+ }
+ else if(module != null && idCount.toString().equals(id)){
+ //try if id is number only
+ issue = IssueManager.getIssueById(id, module.getCode());
}
else{
- //no module is given, business of hope
+ //business of hope
issue = IssueManager.getIssueById(id);
}
Modified: trunk/src/webapp/WEB-INF/templates/reports/SelectUsers.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/reports/SelectUsers.vm?view=diff&pathrev=10866&r1=10865&r2=10866
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/reports/SelectUsers.vm (original)
+++ trunk/src/webapp/WEB-INF/templates/reports/SelectUsers.vm 2010-01-20 04:58:48-0800
@@ -3,7 +3,7 @@
#set ($searchString = $data.Parameters.getString("searchString" , ""))
#set ($searchField = $data.Parameters.getString("searchField" , ""))
<p>
- $l10n.ClickHereReportMessage
+ $l10n.ScrolldownReportMessage
</p>
<h3>$l10n.SelectedUsers</h3>
Modified: trunk/src/webapp/WEB-INF/templates/screens/AssignIssue.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/screens/AssignIssue.vm?view=diff&pathrev=10866&r1=10865&r2=10866
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/screens/AssignIssue.vm (original)
+++ trunk/src/webapp/WEB-INF/templates/screens/AssignIssue.vm 2010-01-20 04:58:48-0800
@@ -9,7 +9,7 @@
#if ($singleIssue)
<div class="colbar">
<ul>
-<li>$l10n.format("ClickHereToSelectUsers", $issueListSize)</li>
+<li>$l10n.format("ScrolldownToSelectUsers", $issueListSize)</li>
<li>$l10n.ChangesSavedOnDone</li>
</ul>
</div>
Modified: trunk/src/webapp/WEB-INF/templates/screens/UserList.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/screens/UserList.vm?view=diff&pathrev=10866&r1=10865&r2=10866
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/screens/UserList.vm (original)
+++ trunk/src/webapp/WEB-INF/templates/screens/UserList.vm 2010-01-20 04:58:48-0800
@@ -44,7 +44,7 @@
<div class="colbar">
<ul>
-<li>$l10n.ClickHereToSelectUsersForQuery</li>
+<li>$l10n.ScrolldownToSelectUsersForQuery</li>
<li>$l10n.ChangesSavedOnDone</li>
</ul>
</div>
Modified: trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueBody.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueBody.vm?view=diff&pathrev=10866&r1=10865&r2=10866
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueBody.vm (original)
+++ trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueBody.vm 2010-01-20 04:58:48-0800
@@ -188,6 +188,18 @@
#set ($showCopyButton = $copyToModules && !$copyToModules.isEmpty())
#set ($showMoveButton = $moveToModules && !$moveToModules.isEmpty())
+## Creates heading for given tab and title.
+## Toggles event handler, which makes it possible to the user
+## to switch current tab on or off.
+#macro (tabHeading $tabId $title)
+ #if($tab.equals("all"))
+ #set($imgName = $tabId.concat(".state"))
+ <h3 onClick=smartToggleVisibility('$tabId')><img name="$imgName" src="$staticLink.setPath($iconCollapse)"/>$title</h3>
+ #else
+ <h3>$title</h3>
+ #end
+#end
+
<input type="hidden" name="action" value="ModifyIssue" />
<input type="hidden" name="mod_ts" value="$scarabG.Now.Time" />
<input type="hidden" name="id" value="$currentIssueId" />
@@ -212,7 +224,6 @@
## </div>
## #end
-
<div class="scarab-canvas">
Modified: trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab2.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab2.vm?view=diff&pathrev=10866&r1=10865&r2=10866
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab2.vm (original)
+++ trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab2.vm 2010-01-20 04:58:48-0800
@@ -1,5 +1,5 @@
### PERSONNEL
-<h3 onClick=smartToggleVisibility('personnel')><img name="personnel.state" src="$staticLink.setPath($iconCollapse)"/>$l10n.format("PersonnelNavi", $numUsers)</h3>
+#tabHeading("personnel" $l10n.format("PersonnelNavi", $numUsers))
<div id='personnel'>
<table width="100%" border="1" cellspacing="2" cellpadding="3">
<tr>
Modified: trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab3.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab3.vm?view=diff&pathrev=10866&r1=10865&r2=10866
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab3.vm (original)
+++ trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab3.vm 2010-01-20 04:58:48-0800
@@ -18,7 +18,7 @@
#end
#end
-<h3 onClick=smartToggleVisibility('comments')><img name="comments.state" src="$staticLink.setPath($iconCollapse)"/>$l10n.format("CommentsNavi", $numComments)</h3>
+#tabHeading("comments" $l10n.format("CommentsNavi", $numComments))
<div id='comments'>
#if ($comments.isEmpty() && !$canAddComment)
$l10n.NoComments
Modified: trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab4Att.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab4Att.vm?view=diff&pathrev=10866&r1=10865&r2=10866
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab4Att.vm (original)
+++ trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab4Att.vm 2010-01-20 04:58:48-0800
@@ -4,7 +4,7 @@
#set ($intakeAttachment = $intake.Attachment.setKey("fileKey$currentIssue.QueryKey"))
#set ($attachments = $currentIssue.ExistingAttachments)
-<h3 onClick=smartToggleVisibility('attachments')><img name="attachments.state" src="$staticLink.setPath($iconCollapse)"/>$l10n.format("AttachmentsNavi",$currentIssue.ExistingAttachments.size())</h3>
+#tabHeading("attachments" $l10n.format("AttachmentsNavi",$currentIssue.ExistingAttachments.size()))
<div id='attachments'>
#if ($attachments.isEmpty() && !$canAddAttachment)
$l10n.NoAttachments
Modified: trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab4Dep.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab4Dep.vm?view=diff&pathrev=10866&r1=10865&r2=10866
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab4Dep.vm (original)
+++ trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab4Dep.vm 2010-01-20 04:58:48-0800
@@ -269,7 +269,7 @@
#### dependencies
################################################################################
-<h3 onClick=smartToggleVisibility('dependencies')><img name="dependencies.state" src="$staticLink.setPath($iconCollapse)"/>$l10n.format("RelationsNavi", $numDependencies)</h3>
+#tabHeading("dependencies" $l10n.format("RelationsNavi", $numDependencies))
<div id='dependencies'>
#if ($numDependencies > 0)
Modified: trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab4Url.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab4Url.vm?view=diff&pathrev=10866&r1=10865&r2=10866
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab4Url.vm (original)
+++ trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab4Url.vm 2010-01-20 04:58:48-0800
@@ -1,4 +1,4 @@
-<h3 onClick=smartToggleVisibility('related')><img name="related.state" src="$staticLink.setPath($iconCollapse)"/>$l10n.format("RelatedLinksNavi",$currentIssue.Urls.size())</h3>
+#tabHeading("related" $l10n.format("RelatedLinksNavi",$currentIssue.Urls.size()))
<div id="related">
#if ($currentIssue.Urls.isEmpty() && !$canEdit)
Modified: trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab5.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab5.vm?view=diff&pathrev=10866&r1=10865&r2=10866
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab5.vm (original)
+++ trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab5.vm 2010-01-20 04:58:48-0800
@@ -4,7 +4,7 @@
#end
#if (!$allActivitySets.isEmpty())
- <h3 onClick=smartToggleVisibility('history')><img name="history.state" src="$staticLink.setPath($iconCollapse)"/>$l10n.ChangeHistory</h3>
+#tabHeading("history" $l10n.ChangeHistory)
<div id="history">
#foreach ($activitySet in $allActivitySets)
@@ -20,8 +20,8 @@
#set ($newValue = "")
#set ($oldValue = "")
#if($currentIssue.isAttributeVisible($act.attribute, $user))
- #set ($newValue = $act.getNewValue($l10n).trim())
- #set ($oldValue = $act.getOldValue($l10n).trim())
+ #set ($newValue = $act.getNewValue($currentIssue, $l10n).trim())
+ #set ($oldValue = $act.getOldValue($currentIssue, $l10n).trim())
<th style="width:12em;">$act.getDisplayName($l10n)</th>
#if( $oldValue.length()>0 )
<td>$!scarabG.textToHTML($l10n.getIgnoreMissingResource($oldValue), $link, $scarabR.CurrentModule)</td>
@@ -38,8 +38,8 @@
#else
<td colspan="5">$l10n.RestrictedActivityDescription</td>
#end
- </tr>
- #end
+ </tr>
+ #end
#set ($reason = $activitySet.getCommentForHistory($currentIssue))
#if($reason.length()>0)
------------------------------------------------------
http://scarab.tigris.org/ds/viewMessage.do?dsForumId=3577&dsMessageId=2440630