Scarab commit: svn commit: r10854 - trunk: . src/conf/classes src/conf/conf src/java/org/tigris/scarab/actions src/java/org/tigris/scarab/attribute src/java/org/tigris/scarab/om src/java/org/tigris/scarab/screens src/java/org/tigris/scarab/screens/admin src/java/org/tigris/scarab/search src/java/org/tigris/scarab/services/security src/java/org/tigris/scarab/tools src/java/org/tigris/scarab/util src/java/org/tigris/scarab/util/word src/sql src/sql/upgrade src/webapp/WEB-INF/templates/macros src/webapp/WEB-INF/templates/navigations src/webapp/WEB-INF/templates/screens src/webapp/WEB-INF/templates/screens/admin src/webapp/WEB-INF/templates/screens/entry
Johannes Höchstädter <[email protected]>
| Newsgroups | gmane.comp.java.scarab.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: jhoech
Date: 2009-09-23 07:43:40-0700
New Revision: 10854
Added:
trunk/src/sql/upgrade/upgrade-0.22-add-new-permissions.sql
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/conf/conf/PermissionMapping.properties
trunk/src/conf/conf/TurbineResources.properties
trunk/src/conf/conf/build.xml
trunk/src/conf/conf/intake.xml
trunk/src/conf/conf/mime.types
trunk/src/java/org/tigris/scarab/actions/ReportIssue.java
trunk/src/java/org/tigris/scarab/attribute/DateAttribute.java
trunk/src/java/org/tigris/scarab/om/AbstractScarabModule.java
trunk/src/java/org/tigris/scarab/om/Activity.java
trunk/src/java/org/tigris/scarab/om/AttributeValue.java
trunk/src/java/org/tigris/scarab/screens/Default.java
trunk/src/java/org/tigris/scarab/screens/ViewIssue.java
trunk/src/java/org/tigris/scarab/screens/admin/ModuleAttributeEdit.java
trunk/src/java/org/tigris/scarab/search/CachedQuery.java
trunk/src/java/org/tigris/scarab/services/security/ScarabSecurity.java
trunk/src/java/org/tigris/scarab/tools/ScarabGlobalTool.java
trunk/src/java/org/tigris/scarab/tools/ScarabRequestTool.java
trunk/src/java/org/tigris/scarab/util/ScarabConstants.java
trunk/src/java/org/tigris/scarab/util/ScarabUtil.java
trunk/src/java/org/tigris/scarab/util/word/IssueSearch.java
trunk/src/java/org/tigris/scarab/util/word/QueryResult.java
trunk/src/sql/scarab-security.sql
trunk/src/webapp/WEB-INF/templates/macros/GlobalMacros.vm
trunk/src/webapp/WEB-INF/templates/navigations/Administration.vm
trunk/src/webapp/WEB-INF/templates/navigations/CommonLinks.vm
trunk/src/webapp/WEB-INF/templates/navigations/ModuleAdmin.vm
trunk/src/webapp/WEB-INF/templates/screens/RequestRoles.vm
trunk/src/webapp/WEB-INF/templates/screens/admin/AttributeOptionSelect.vm
trunk/src/webapp/WEB-INF/templates/screens/admin/AttributeSelect.vm
trunk/src/webapp/WEB-INF/templates/screens/admin/UserAttributeSelect.vm
trunk/src/webapp/WEB-INF/templates/screens/entry/Wizard3.vm
Log:
MRG - Merged current changes from 0.22 branch back into trunk. Branch was in revision 10853.
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=10854&r1=10853&r2=10854
==============================================================================
--- trunk/src/conf/classes/ScarabBundle_de.properties (original)
+++ trunk/src/conf/classes/ScarabBundle_de.properties 2009-09-23 07:43:40-0700
@@ -428,12 +428,10 @@
NoAttributesDefinedForTemplate=Es sind keine Attribute für den Ticket-Typ "{0}" definiert. Eine neue Vorlage kann nur erstellen werden, wenn mindestens ein Template-Attribut definiert wurde.
ApplyTemplate={0} Vorlage verwenden
ViewAllTemplates=Alle {0} Vorlagen anzeigen
-NewIssue=Neue(r) {0}
+NewIssue=Neu: {0}
PossibleDuplicates=Mögliches Duplikat
DateClosed=Abschluß-Datum
AttachmentFieldRequired=Anhang-Felder werden nur benötigt, wenn Feld "{0}" gesetzt ist
-Other=Andere (Mime-Typ eingeben:
-CloseParenth=)
OtherActivity=Andere
SubmitNewIssue=Neues Ticket anlegen
CommentFieldDesc=Benutzen Sie dieses Feld, um passende Informationen hinzuzufügen. Ihre Kommentare werden in der E-Mail zum neuen Ticket angehängt und können in der Ticket-Ansicht über den Reiter "Kommentare" angezeigt werden.
@@ -2226,7 +2224,7 @@
ConditionsExplanation3=Klicken Sie auf "Bedingungen zurücksetzen", wenn Sie alle Regeln löschen wollen.
ConditionsNewValue=Neuer Wert
ConditionsSetOn=Bedingung erfüllt
-CustomMimeType=BenutzerdefinierterMIME Type
+CustomMimeType=Benutzerdefinierter MIME Type
ModifyDependencies=Ausgewählte Abhängigkeit(en) ändern nach:
ModifyRelations=Ausgewählte ändern in
DependencyType=Relation
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=10854&r1=10853&r2=10854
==============================================================================
--- trunk/src/conf/classes/ScarabBundle_en.properties (original)
+++ trunk/src/conf/classes/ScarabBundle_en.properties 2009-09-23 07:43:40-0700
@@ -510,8 +510,6 @@
PossibleDuplicates=Possible duplicates
DateClosed=Date closed
AttachmentFieldRequired=attachment fields are only required if the {0} is set
-Other=Other (enter mime type:
-CloseParenth=)
OtherActivity=Other
SubmitNewIssue=Submit new issue
CommentFieldDesc=Use this field to enter any pertinent information. Your comments will be included in the new issue email and can be viewed on the Comment tab when viewing the issue.
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=10854&r1=10853&r2=10854
==============================================================================
--- trunk/src/conf/classes/ScarabBundle_es.properties (original)
+++ trunk/src/conf/classes/ScarabBundle_es.properties 2009-09-23 07:43:40-0700
@@ -456,9 +456,6 @@
PossibleDuplicates = Posibles duplicados
DateClosed = Fecha de cierre
AttachmentFieldRequired = los campos de adjunto son sólo requeridos si el {0} está activo
-Other = Otro (tipo mime:
-#-TRANS
-CloseParenth = )
SubmitNewIssue = Enviar nueva petición
CommentFieldDesc = Usa este campo para introducir cualquier información pertinente. Tus comentarios se incuirán en el email y podrán leerse al visualizar la petición.
MissedRequired1 = Requerido
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=10854&r1=10853&r2=10854
==============================================================================
--- trunk/src/conf/classes/ScarabBundle_fr.properties (original)
+++ trunk/src/conf/classes/ScarabBundle_fr.properties 2009-09-23 07:43:40-0700
@@ -468,8 +468,6 @@
PossibleDuplicates = Doublons possibles
DateClosed = Date de fermeture
AttachmentFieldRequired = les champs attachés ne sont requis que si {0} est défini
-Other = Autre (entrer le type MIME:
-CloseParenth = )
SubmitNewIssue = Nouvelle fiche
CommentFieldDesc = Utilisez ce champ pour entrer toute information pertinente. Vos commentaires seront inclus dans le courriel de la nouvelle fiche et pourront être vus dans l'onglet Commentaire à la consultation de la fiche.
MissedRequired1 = Obligatoire
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=10854&r1=10853&r2=10854
==============================================================================
--- trunk/src/conf/classes/ScarabBundle_it.properties (original)
+++ trunk/src/conf/classes/ScarabBundle_it.properties 2009-09-23 07:43:40-0700
@@ -430,8 +430,6 @@
PossibleDuplicates=Duplicati possibili
DateClosed=Data di chiusura
AttachmentFieldRequired=i campi allegati sono richiesti solo se {0} è impostato
-Other=Altri (Inserire mime type:
-CloseParenth=)
SubmitNewIssue=Invia nuova segnalazione
CommentFieldDesc=Utilizza questo campo per inserire qualsiasi informazione pertinente. I tuoi commenti verranno inclusi nella mail e potranno essere visualizzati nella cartella Commenti nella visualizzazione della segnalazione.
MissedRequired1=Richiesto
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=10854&r1=10853&r2=10854
==============================================================================
--- trunk/src/conf/classes/ScarabBundle_ja.properties (original)
+++ trunk/src/conf/classes/ScarabBundle_ja.properties 2009-09-23 07:43:40-0700
@@ -367,8 +367,6 @@
PossibleDuplicates=\u8003\u3048\u3089\u308c\u308b\u91cd\u8907\u5bfe\u8c61
DateClosed=Date closed
AttachmentFieldRequired={0}\u304c\u8a2d\u5b9a\u3055\u308c\u3066\u3044\u308b\u5834\u5408\u306e\u307f\u3001\u3053\u306e\u9805\u76ee\u306b\u95a2\u9023\u3059\u308b\u30d5\u30a3\u30fc\u30eb\u30c9\u3078\u306e\u5165\u529b\u304c\u5fc5\u9808\u3068\u306a\u308a\u307e\u3059\u3002
-Other=\u305d\u306e\u4ed6 (mime \u30bf\u30a4\u30d7\u3092\u5165\u529b :
-CloseParenth=)
SubmitNewIssue=\u65b0\u3057\u3044\u6848\u4ef6\u306e\u6295\u7a3f
CommentFieldDesc=\u30b3\u30e1\u30f3\u30c8\u3092\u5165\u529b\u3059\u308b\u3068\u3001\u305d\u306e\u30b3\u30e1\u30f3\u30c8\u306f\u65b0\u3057\u3044\u6848\u4ef6\u306e\u901a\u77e5\u30e1\u30fc\u30eb\u3084\u3001\u6848\u4ef6\u306e\u8a73\u7d30\u8868\u793a\u6642\u306b\u8868\u793a\u3055\u308c\u307e\u3059\u3002
MissedRequired1=\u5fc5\u9808\u3067\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=10854&r1=10853&r2=10854
==============================================================================
--- trunk/src/conf/classes/ScarabBundle_ko.properties (original)
+++ trunk/src/conf/classes/ScarabBundle_ko.properties 2009-09-23 07:43:40-0700
@@ -381,8 +381,6 @@
PossibleDuplicates = [ko]Possible duplicates
DateClosed = [ko]Date closed
AttachmentFieldRequired = [ko]attachment fields are only required if the {0} is set
-Other = [ko]Other (enter mime type:
-CloseParenth = )
SubmitNewIssue = [ko]Submit new issue
CommentFieldDesc = Use this field to enter any pertinent information. Your comments will be included in the new issue email and can be viewed on the Comment tab when viewing the issue.
MissedRequired1 = [ko]Required
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=10854&r1=10853&r2=10854
==============================================================================
--- trunk/src/conf/classes/ScarabBundle_nl.properties (original)
+++ trunk/src/conf/classes/ScarabBundle_nl.properties 2009-09-23 07:43:40-0700
@@ -356,8 +356,6 @@
PossibleDuplicates = Mogelijke duplikaten
DateClosed = Datum afgesloten
AttachmentFieldRequired = bijlage velden zijn alleen verplicht als het {0} gezet is
-Other = Overig (geef mime soort:
-CloseParenth = )
SubmitNewIssue = Vastleggen nieuwe kaart
CommentFieldDesc = Gebruik dit veld om vaste informatie in te voeren. Uw commentaar wordt opgenomen in de e-mail voor de nieuwe kaart en kan als commentaar bij een kaart geraadpleegd worden.
MissedRequired1 = Verplicht
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=10854&r1=10853&r2=10854
==============================================================================
--- trunk/src/conf/classes/ScarabBundle_pl.properties (original)
+++ trunk/src/conf/classes/ScarabBundle_pl.properties 2009-09-23 07:43:40-0700
@@ -477,8 +477,6 @@
PossibleDuplicates=Gro\u017aba zduplikowania
DateClosed=Data zamkni\u0119cia
AttachmentFieldRequired=za\u0142\u0105czniki s\u0105 wymagane tylko wtedy gdy {0} jest ustawione
-Other=Inny (wprowad\u017a typ mime:
-CloseParenth=)
SubmitNewIssue=Wy\u015blij nowe zagadnienie
CommentFieldDesc=U\u017cywaj tego pola do wprowadzania wszelkich informacji maj\u0105cych zwi\u0105zek z zagadnieniem. Twoje komentarze b\u0119d\u0105 wys\u0142ane w nowym mailu dot. zagadnienia i b\u0119dzie je mo\u017cna przegl\u0105da\u0107 na zak\u0142adce Komentarze.
MissedRequired1=Wymagane
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=10854&r1=10853&r2=10854
==============================================================================
--- trunk/src/conf/classes/ScarabBundle_pt_BR.properties (original)
+++ trunk/src/conf/classes/ScarabBundle_pt_BR.properties 2009-09-23 07:43:40-0700
@@ -357,8 +357,6 @@
PossibleDuplicates=Possíveis duplicados
DateClosed=Data de fechamento
AttachmentFieldRequired=campos anexos são somente obrigatórios se o {0} está ajustado
-Other=Outro (cadastrar tipo mime:
-CloseParenth=)
SubmitNewIssue=Enviar novo item
CommentFieldDesc=Use este campo para cadastrar qualquer informação pertinente. Seus comentários serão incluídos no email de novo item e podem ser vistos na guia de comentários quando consultar o item.
MissedRequired1=Obrigatório
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=10854&r1=10853&r2=10854
==============================================================================
--- trunk/src/conf/classes/ScarabBundle_ru.properties (original)
+++ trunk/src/conf/classes/ScarabBundle_ru.properties 2009-09-23 07:43:40-0700
@@ -587,8 +587,6 @@
ClickToExecute = Click on "Availability" to execute report.
-CloseParenth = )
-
Code = \u041A\u043E\u0434
CollabNet = CollabNet
@@ -2328,8 +2326,6 @@
Options = \u041F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u044B
-Other = \u0414\u0440\u0443\u0433\u043E\u0439 (\u0432\u0432\u0435\u0441\u0442\u0438 \u0442\u0438\u043F mime:
-
OtherModuleIssuesInDomain = Other modules / issue types in this domain
Overall = Import result:
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=10854&r1=10853&r2=10854
==============================================================================
--- trunk/src/conf/classes/ScarabBundle_zh_CN.properties (original)
+++ trunk/src/conf/classes/ScarabBundle_zh_CN.properties 2009-09-23 07:43:40-0700
@@ -369,8 +369,6 @@
PossibleDuplicates = \u53ef\u80fd\u91cd\u590d
DateClosed = \u5173\u95ed\u65e5\u671f
AttachmentFieldRequired = \u4ec5\u5728\u8bbe\u7f6e{0}\u65f6\uff0c\u9644\u4ef6\u57df\u662f\u5fc5\u987b\u7684\u3002
-Other = \u5176\u5b83 (\u8f93\u5165MIME\u7c7b\u578b:
-CloseParenth = )
SubmitNewIssue = \u63d0\u4ea4\u65b0\u6848\u4ef6
CommentFieldDesc = \u53ef\u4f7f\u7528\u6b64\u57df\u8f93\u5165\u76f8\u5173\u4fe1\u606f\u3002\u8fd9\u4e9b\u4fe1\u606f\u5c06\u8bb0\u5165\u65b0\u7684\u6848\u4ef6\u90ae\u4ef6\u4e2d\uff0c\u5e76\u4e14\u4ee5\u540e\u53ef\u901a\u8fc7\u6848\u4ef6\u201c\u6ce8\u91ca\u201d\u9875\u9762\u67e5\u770b.
MissedRequired1 = \u5fc5\u987b
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=10854&r1=10853&r2=10854
==============================================================================
--- trunk/src/conf/classes/ScarabBundle_zh_TW.properties (original)
+++ trunk/src/conf/classes/ScarabBundle_zh_TW.properties 2009-09-23 07:43:40-0700
@@ -421,8 +421,6 @@
PossibleDuplicates=Possible duplicates
DateClosed=Date closed
AttachmentFieldRequired=attachment fields are only required if the {0} is set
-Other=Other (enter mime type:
-CloseParenth=)
SubmitNewIssue=\u63d0\u4ea4\u65b0\u8b70\u984c
CommentFieldDesc=Use this field to enter any pertinent information. Your comments will be included in the new issue email and can be viewed on the Comment tab when viewing the issue.
MissedRequired1=\u5fc5\u586b\u7684\u6b04\u4f4d
Modified: trunk/src/conf/conf/PermissionMapping.properties
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/conf/conf/PermissionMapping.properties?view=diff&pathrev=10854&r1=10853&r2=10854
==============================================================================
--- trunk/src/conf/conf/PermissionMapping.properties (original)
+++ trunk/src/conf/conf/PermissionMapping.properties 2009-09-23 07:43:40-0700
@@ -1,5 +1,6 @@
# permission mappings between Scarab tasks and permissions defined
-# in the system providing authorization.
+# in the system providing authorization.
+services.ScarabSecurity.map.Request__Role=Role | Request
services.ScarabSecurity.map.Issue__Edit=Issue | Edit
services.ScarabSecurity.map.Issue__Delete=Issue | Delete
services.ScarabSecurity.map.Issue__Enter=Issue | Enter
Modified: trunk/src/conf/conf/TurbineResources.properties
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/conf/conf/TurbineResources.properties?view=diff&pathrev=10854&r1=10853&r2=10854
==============================================================================
--- trunk/src/conf/conf/TurbineResources.properties (original)
+++ trunk/src/conf/conf/TurbineResources.properties 2009-09-23 07:43:40-0700
@@ -699,6 +699,7 @@
services.ScarabSecurity.screen.SaveQuery.vm=User__Edit_Preferences
services.ScarabSecurity.screen.SaveTemplate.vm=User__Edit_Preferences
services.ScarabSecurity.screen.ConfigureIssueList.vm=User__Edit_Preferences
+services.ScarabSecurity.screen.RequestRoles.vm=Request__Role
# reports
services.ScarabSecurity.screen.reports.Report_1.vm=Issue__Search
Modified: trunk/src/conf/conf/build.xml
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/conf/conf/build.xml?view=diff&pathrev=10854&r1=10853&r2=10854
==============================================================================
--- trunk/src/conf/conf/build.xml (original)
+++ trunk/src/conf/conf/build.xml 2009-09-23 07:43:40-0700
@@ -40,7 +40,7 @@
jdbc driver = ${scarab.database.jdbc.driver}
skip jira templates = ${skip.jira.templates.data}
skip sample data = ${skip.seed.data}
- skip default data = ${skip.default.data}
+ skip default data = ${skip.default.data}
</echo>
</target>
Modified: trunk/src/conf/conf/intake.xml
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/conf/conf/intake.xml?view=diff&pathrev=10854&r1=10853&r2=10854
==============================================================================
--- trunk/src/conf/conf/intake.xml (original)
+++ trunk/src/conf/conf/intake.xml 2009-09-23 07:43:40-0700
@@ -293,6 +293,7 @@
</field>
<field name="NumericValue" key="num" type="int">
<rule name="mask" value="[0-9]+">intake_InvalidInteger</rule>
+ <required-message>intake_ModuleRequiresDataForAttribute</required-message>
</field>
<field name="UserIds" key="visids" type="int" multiValued="true"/>
<field name="Value" key="val" type="String">
Modified: trunk/src/conf/conf/mime.types
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/conf/conf/mime.types?view=diff&pathrev=10854&r1=10853&r2=10854
==============================================================================
Binary files. No diff available.
Modified: trunk/src/java/org/tigris/scarab/actions/ReportIssue.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/actions/ReportIssue.java?view=diff&pathrev=10854&r1=10853&r2=10854
==============================================================================
--- trunk/src/java/org/tigris/scarab/actions/ReportIssue.java (original)
+++ trunk/src/java/org/tigris/scarab/actions/ReportIssue.java 2009-09-23 07:43:40-0700
@@ -64,6 +64,7 @@
import org.apache.turbine.tool.IntakeTool;
import org.tigris.scarab.actions.base.RequireLoginFirstAction;
import org.tigris.scarab.attribute.DateAttribute;
+import org.tigris.scarab.attribute.IntegerAttribute;
import org.tigris.scarab.attribute.OptionAttribute;
import org.tigris.scarab.attribute.UserAttribute;
import org.tigris.scarab.notification.NotificationManagerFactory;
@@ -295,6 +296,10 @@
selectedOptions.add(fieldValue);
}
}
+ else if (aval instanceof IntegerAttribute)
+ {
+ field = group.get("NumericValue");
+ }
else if (aval instanceof UserAttribute)
{
field = group.get("UserId");
@@ -385,8 +390,18 @@
intake.get("AttributeValue", aval.getQueryKey(), false);
if (group != null)
{
- Field field = group.get(aval instanceof OptionAttribute ?
- "OptionId" : "Value");
+
+ Field field = null;
+ if(aval instanceof OptionAttribute){
+ field = group.get("OptionId");
+ }
+ else if(aval instanceof IntegerAttribute){
+ field = group.get("NumericValue");
+ }
+ else{
+ field = group.get("Value");
+ }
+
String value = field.toString();
if (value != null && value.length() > 0)
Modified: trunk/src/java/org/tigris/scarab/attribute/DateAttribute.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/attribute/DateAttribute.java?view=diff&pathrev=10854&r1=10853&r2=10854
==============================================================================
--- trunk/src/java/org/tigris/scarab/attribute/DateAttribute.java (original)
+++ trunk/src/java/org/tigris/scarab/attribute/DateAttribute.java 2009-09-23 07:43:40-0700
@@ -67,8 +67,8 @@
* Receives the value in yyyyMMddHHmmssSS format and returns it
* formatted according to the mask parameter.
* If the value is not parseable, it will be returned unchanged.
- * @param value
- * @param mask
+ * @param value : Value which should be parsed.
+ * @param mask : Date format.
* @return
*/
public static String dateFormat(String value, String mask)
Modified: trunk/src/java/org/tigris/scarab/om/AbstractScarabModule.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/om/AbstractScarabModule.java?view=diff&pathrev=10854&r1=10853&r2=10854
==============================================================================
--- trunk/src/java/org/tigris/scarab/om/AbstractScarabModule.java (original)
+++ trunk/src/java/org/tigris/scarab/om/AbstractScarabModule.java 2009-09-23 07:43:40-0700
@@ -537,7 +537,8 @@
}
/**
- * gets a list of all of the Attributes in a Module based on the Criteria.
+ * gets a list of all of the Attributes in a Module based on the Criteria
+ * and based on r_module_attribute mappings.
*/
public List getAttributes(final Criteria criteria)
throws TorqueException
@@ -1129,7 +1130,13 @@
public List getAllAttributes()
throws TorqueException
{
- return getAttributes(new Criteria());
+ Criteria crit = new Criteria();
+ crit.addJoin(RModuleAttributePeer.ATTRIBUTE_ID, AttributePeer.ATTRIBUTE_ID);
+ crit.add(RModuleAttributePeer.MODULE_ID, getModuleId());
+ crit.setDistinct();
+ List result = AttributePeer.doSelect(crit);
+
+ return result;
}
/**
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=10854&r1=10853&r2=10854
==============================================================================
--- trunk/src/java/org/tigris/scarab/om/Activity.java (original)
+++ trunk/src/java/org/tigris/scarab/om/Activity.java 2009-09-23 07:43:40-0700
@@ -53,6 +53,7 @@
import org.apache.torque.util.Criteria;
import java.sql.Connection;
+import org.tigris.scarab.attribute.DateAttribute;
import org.tigris.scarab.notification.ActivityType;
import org.tigris.scarab.om.Attachment;
import org.tigris.scarab.services.cache.ScarabCache;
@@ -200,6 +201,12 @@
return s.substring(0, end ) + "...";
}
+ /**
+ * Returns old value, before activity took place.
+ * @param l10n : Instance of localization.
+ * @return : Old value.
+ * @throws Exception
+ */
public String getOldValue(ScarabLocalizationTool l10n)
throws Exception
{
@@ -220,11 +227,24 @@
{
value = getOldValue()!=null ? firstChars( getOldValue(), 50 ) : "";
} else {
- value = getOldValue()!=null ? getOldValue() : "";
+ //assumption that an attribute was changed
+ if(getAttribute() != null && getAttribute().isDateAttribute()){
+ value = DateAttribute.dateFormat(getOldValue()!=null ? getOldValue() : "", L10NKeySet.ShortDateDisplay.getMessage(l10n));
+ }
+ else{
+ value = getOldValue()!=null ? getOldValue() : "";
+ }
}
return value;
}
+
+ /**
+ * Returns new value, after activity took place.
+ * @param l10n : Instance of localization.
+ * @return : New value.
+ * @throws Exception
+ */
public String getNewValue(ScarabLocalizationTool l10n)
throws Exception
{
@@ -249,7 +269,14 @@
{
value = super.getDescription()!=null ? super.getDescription() : "";
} else {
- value = getNewValue()!=null ? getNewValue() : "";
+ //assumption that an attribute was changed
+ if(getAttribute() != null && getAttribute().isDateAttribute()){
+ value = DateAttribute.dateFormat(getNewValue()!=null ? getNewValue() : "", L10NKeySet.ShortDateDisplay.getMessage(l10n));
+ }
+ else{
+ value = getNewValue()!=null ? getNewValue() : "";
+ }
+
}
return value;
}
Modified: trunk/src/java/org/tigris/scarab/om/AttributeValue.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/om/AttributeValue.java?view=diff&pathrev=10854&r1=10853&r2=10854
==============================================================================
--- trunk/src/java/org/tigris/scarab/om/AttributeValue.java (original)
+++ trunk/src/java/org/tigris/scarab/om/AttributeValue.java 2009-09-23 07:43:40-0700
@@ -57,11 +57,13 @@
import org.apache.torque.TorqueException;
import org.apache.torque.om.Persistent;
+import org.tigris.scarab.tools.ScarabLocalizationTool;
import org.tigris.scarab.tools.localization.L10NKeySet;
import org.tigris.scarab.tools.localization.LocalizationKey;
import org.tigris.scarab.util.ScarabConstants;
import org.tigris.scarab.util.ScarabException;
import org.tigris.scarab.util.Log;
+import org.tigris.scarab.attribute.DateAttribute;
import org.tigris.scarab.notification.ActivityType;
import org.tigris.scarab.om.ScarabUserManager;
import org.tigris.scarab.om.Module;
@@ -660,7 +662,13 @@
return rma;
}
- public String getDisplayValue()
+ /**
+ * Returns value for attribute in display format.
+ * @param l10n : Instance of ScarabLocalizationTool.
+ * @return : (Formatted) value of attribute.
+ * @throws TorqueException
+ */
+ public String getDisplayValue(ScarabLocalizationTool l10n)
throws TorqueException
{
String displayValue = null;
@@ -682,6 +690,10 @@
{
displayValue = getScarabUser().getUserName();
}
+ else if(getAttribute().isDateAttribute())
+ {
+ displayValue = DateAttribute.dateFormat(getValue(), L10NKeySet.ShortDateDisplay.getMessage(l10n));
+ }
else
{
displayValue = getValue();
Modified: trunk/src/java/org/tigris/scarab/screens/Default.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/screens/Default.java?view=diff&pathrev=10854&r1=10853&r2=10854
==============================================================================
--- trunk/src/java/org/tigris/scarab/screens/Default.java (original)
+++ trunk/src/java/org/tigris/scarab/screens/Default.java 2009-09-23 07:43:40-0700
@@ -301,4 +301,13 @@
return (ScarabLocalizationTool) context.get(
ScarabConstants.LOCALIZATION_TOOL);
}
+
+ /**
+ * Returns the cancelTemplate to be executed. Otherwise returns null.
+ */
+ public String getCancelTemplate(RunData data)
+ {
+ return data.getParameters()
+ .getString(ScarabConstants.CANCEL_TEMPLATE, null);
+ }
}
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=10854&r1=10853&r2=10854
==============================================================================
--- trunk/src/java/org/tigris/scarab/screens/ViewIssue.java (original)
+++ trunk/src/java/org/tigris/scarab/screens/ViewIssue.java 2009-09-23 07:43:40-0700
@@ -86,8 +86,10 @@
super.doBuildTemplate(data, context);
ScarabRequestTool scarabR = getScarabRequestTool(context);
Issue issue = null;
- String id = data.getParameters().getString("id").trim();
- issue = getReferredIssue(id, (ScarabModule)scarabR.getCurrentModule());
+
+ String id = data.getParameters().getString("id");
+ issue = getReferredIssue(id == null ? null : id.trim(), (ScarabModule)scarabR.getCurrentModule());
+
boolean hasViewPermission = false;
boolean hasDeletePermission = false;
// Deleted issues will appear to not have existed before
@@ -120,19 +122,51 @@
}
}
+ /**
+ * Returns issue according to given issue id,
+ * which can be a simple number or an id including module's prefix.
+ * @param id : id of issue
+ * @param module : module for issue
+ * @return : Issue. Value is null if no issue was found.
+ */
private Issue getReferredIssue(String id, ScarabModule module)
{
- if (module != null)
- { // Will prefix with module's code if ID is just a number
- try
+ Issue issue = null;
+
+ //get simple number from id
+ StringBuffer idCount = new StringBuffer();
+ for (int i = 0; i < id.length(); i++)
+ {
+ char c = id.charAt(i);
+ if (c >= '0' && c <= '9')
{
- Integer.parseInt(id);
- id = module.getCode().concat(id);
+ idCount.append(c);
}
- catch (NumberFormatException nfe) {}
}
-
- Issue issue = IssueManager.getIssueById(id);
+
+ 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());
+ }
+
+ }
+ else{
+ //no module is given, business of hope
+ issue = IssueManager.getIssueById(id);
+ }
+
return issue;
}
Modified: trunk/src/java/org/tigris/scarab/screens/admin/ModuleAttributeEdit.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/screens/admin/ModuleAttributeEdit.java?view=diff&pathrev=10854&r1=10853&r2=10854
==============================================================================
--- trunk/src/java/org/tigris/scarab/screens/admin/ModuleAttributeEdit.java (original)
+++ trunk/src/java/org/tigris/scarab/screens/admin/ModuleAttributeEdit.java 2009-09-23 07:43:40-0700
@@ -59,6 +59,7 @@
import org.tigris.scarab.om.IssueType;
import org.tigris.scarab.om.RModuleAttribute;
import org.tigris.scarab.util.Log;
+import org.tigris.scarab.util.ScarabConstants;
/**
* Handles dynamic title
@@ -112,7 +113,21 @@
}
}
}
-
+
return l10n.format("EditModuleAttribute", title);
}
+
+ public void doBuildTemplate(RunData data, TemplateContext context)
+ throws Exception
+ {
+ super.doBuildTemplate(data, context);
+
+ // workaround to avoid calling the same template once again as cancel template
+ // SCB2624
+ String cancelTemplate = getCancelTemplate(data);
+ if(cancelTemplate == null || cancelTemplate.equals("admin,ModuleAttributeEdit.vm")){
+ data.getParameters().setString(ScarabConstants.CANCEL_TEMPLATE, "admin,AttributeGroupEdit.vm");
+ }
+
+ }
}
Modified: trunk/src/java/org/tigris/scarab/search/CachedQuery.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/search/CachedQuery.java?view=diff&pathrev=10854&r1=10853&r2=10854
==============================================================================
--- trunk/src/java/org/tigris/scarab/search/CachedQuery.java (original)
+++ trunk/src/java/org/tigris/scarab/search/CachedQuery.java 2009-09-23 07:43:40-0700
@@ -12,7 +12,7 @@
public class CachedQuery {
private static final char DOT_REPLACEMENT_IN_JOIN_CONDITION = '#';
- private static final int MAXIMUM_INITIAL_ROWS = 1000;
+
private static final String LOGGER = "org.apache.torque";
private Criteria criteria;
@@ -73,7 +73,7 @@
{
if(!countOnly)
{
- criteria.setLimit(MAXIMUM_INITIAL_ROWS).setOffset(0);
+ criteria.setLimit(-1).setOffset(0);
String sql = adjustSelectSql(BasePeer.createQueryString(criteria));
cachedRows = executeSelect(sql);
}
@@ -82,7 +82,7 @@
totalRowCount = cachedRows.size();
- if(countOnly || cachedRows.size()==MAXIMUM_INITIAL_ROWS)
+ if(countOnly)
{
criteria.setLimit(-1).setOffset(0);
String sql = adjustSelectSql(BasePeer.createQueryString(criteria));
Modified: trunk/src/java/org/tigris/scarab/services/security/ScarabSecurity.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/services/security/ScarabSecurity.java?view=diff&pathrev=10854&r1=10853&r2=10854
==============================================================================
--- trunk/src/java/org/tigris/scarab/services/security/ScarabSecurity.java (original)
+++ trunk/src/java/org/tigris/scarab/services/security/ScarabSecurity.java 2009-09-23 07:43:40-0700
@@ -203,6 +203,13 @@
*/
public static final String USER__CHANGE_PASSWORD =
getService().getPermissionImpl("User__Change_Password");
+
+ /**
+ * Specifies that user is allowed to request a role
+ * for any module.
+ */
+ public static final String REQUEST__ROLE =
+ getService().getPermissionImpl("Request__Role");
private Configuration props;
@@ -234,6 +241,7 @@
if (allPermissions == null)
{
List tmpPerms = new ArrayList();
+ addPerm(tmpPerms, ScarabSecurity.REQUEST__ROLE);
addPerm(tmpPerms, ScarabSecurity.ISSUE__EDIT);
addPerm(tmpPerms, ScarabSecurity.ISSUE__ENTER);
addPerm(tmpPerms, ScarabSecurity.ISSUE__SEARCH);
Modified: trunk/src/java/org/tigris/scarab/tools/ScarabGlobalTool.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/tools/ScarabGlobalTool.java?view=diff&pathrev=10854&r1=10853&r2=10854
==============================================================================
--- trunk/src/java/org/tigris/scarab/tools/ScarabGlobalTool.java (original)
+++ trunk/src/java/org/tigris/scarab/tools/ScarabGlobalTool.java 2009-09-23 07:43:40-0700
@@ -774,6 +774,9 @@
{
txt = engine.render(text, context);
}
+ else if(renderEngine.equals("html")){
+ txt = text;
+ }
else
{
txt = "<pre>" +
Modified: trunk/src/java/org/tigris/scarab/tools/ScarabRequestTool.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/tools/ScarabRequestTool.java?view=diff&pathrev=10854&r1=10853&r2=10854
==============================================================================
--- trunk/src/java/org/tigris/scarab/tools/ScarabRequestTool.java (original)
+++ trunk/src/java/org/tigris/scarab/tools/ScarabRequestTool.java 2009-09-23 07:43:40-0700
@@ -692,6 +692,7 @@
* @param mitlist use a custom MITList instead of the user's current mitlist
* @return the name to use
* @throws TorqueException
+ * [HD] fixed bug SCB2794 (revert an API change. This method is used from velocity)
*/
public String getRModuleAttributeDisplayName(final Attribute attribute, final MITList mitlist)
throws TorqueException
@@ -1977,8 +1978,6 @@
String sortPolarity = data.getParameters().getString("sortPolarity");
String currentQueryAddition = "" + sortColumn + sortInternal + sortPolarity;
String cachedQueryAddition = (String)data.getUser().getTemp("queryAddition");
- if(currentQueryAddition.equals("nullnullnull"))
- currentQueryAddition = cachedQueryAddition;
List queryResult = (List)data.getUser().getTemp("queryResult");
Modified: trunk/src/java/org/tigris/scarab/util/ScarabConstants.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/util/ScarabConstants.java?view=diff&pathrev=10854&r1=10853&r2=10854
==============================================================================
--- trunk/src/java/org/tigris/scarab/util/ScarabConstants.java (original)
+++ trunk/src/java/org/tigris/scarab/util/ScarabConstants.java 2009-09-23 07:43:40-0700
@@ -214,6 +214,11 @@
final String DROPDOWN_TREE = "Dropdown tree";
/**
+ * Another attribute type
+ */
+ final String INTEGER = "integer";
+
+ /**
* Scarab.properties key for roles to be automatically approved.
*/
final String AUTO_APPROVED_ROLES = "scarab.automatic.role.approval";
Modified: trunk/src/java/org/tigris/scarab/util/ScarabUtil.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/util/ScarabUtil.java?view=diff&pathrev=10854&r1=10853&r2=10854
==============================================================================
--- trunk/src/java/org/tigris/scarab/util/ScarabUtil.java (original)
+++ trunk/src/java/org/tigris/scarab/util/ScarabUtil.java 2009-09-23 07:43:40-0700
@@ -59,6 +59,7 @@
import org.apache.commons.lang.StringUtils;
import org.apache.fulcrum.parser.StringValueParser;
import org.apache.turbine.RunData;
+import org.tigris.scarab.om.Issue;
import org.tigris.scarab.om.IssueManager;
import org.tigris.scarab.om.Module;
import org.tigris.scarab.tools.ScarabLocalizationTool;
@@ -134,14 +135,23 @@
{
final List tmpList = (List)tmp;
final String id = (String)tmpList.get(1);
- final String defaultText = IssueManager.getIssueById(id).getDefaultText();
- final String attributes = "alt=\"" + defaultText + "\" title=\"" + defaultText + "\"";
-
- link.addPathInfo("id", id);
- link.addPathInfo("tab", "1");
- link.setLabel((String)tmpList.get(0));
- final String bar = link.setAttributeText(attributes).toString();
- sb.append(bar);
+ final Issue issue = IssueManager.getIssueById(id);
+
+ if(issue != null){
+ final String defaultText = issue.getDefaultText();
+ final String attributes = "alt=\"" + defaultText + "\" title=\"" + defaultText + "\"";
+
+ link.addPathInfo("id", id);
+ link.addPathInfo("tab", "1");
+ link.setLabel((String)tmpList.get(0));
+ final String bar = link.setAttributeText(attributes).toString();
+ sb.append(bar);
+ }
+ else{
+ //write token back, no valid issue found for linking
+ sb.append((String)tmpList.get(0));
+ }
+
}
}
return sb.toString();
Modified: trunk/src/java/org/tigris/scarab/util/word/IssueSearch.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/util/word/IssueSearch.java?view=diff&pathrev=10854&r1=10853&r2=10854
==============================================================================
--- trunk/src/java/org/tigris/scarab/util/word/IssueSearch.java (original)
+++ trunk/src/java/org/tigris/scarab/util/word/IssueSearch.java 2009-09-23 07:43:40-0700
@@ -684,11 +684,19 @@
this.sortAttributeId = v;
}
+ /**
+ * sets the name of the internal attribute to sort for
+ * @param internal : name of internal attribute, e.g. "IssueType"
+ */
public void setSortInternalAttribute(String internal)
{
this.sortInternalAttribute = internal;
}
+ /**
+ * returns name of internal attribute of serach
+ * @return : name of internal attribute, e.g. "IssueType"
+ */
public String getSortInternalAttribute()
{
return this.sortInternalAttribute;
Modified: trunk/src/java/org/tigris/scarab/util/word/QueryResult.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/util/word/QueryResult.java?view=diff&pathrev=10854&r1=10853&r2=10854
==============================================================================
--- trunk/src/java/org/tigris/scarab/util/word/QueryResult.java (original)
+++ trunk/src/java/org/tigris/scarab/util/word/QueryResult.java 2009-09-23 07:43:40-0700
@@ -168,7 +168,7 @@
if(sortValueId!=null)
{
AttributeValue sortValue = AttributeValueManager.getInstance(sortValueId);
- singleValue = sortValue.getDisplayValue();
+ singleValue = sortValue.getDisplayValue(L10N);
}
else
{
@@ -181,7 +181,7 @@
{
for(int i=0;i<attributeValue.size();i++)
{
- singleValue = ((AttributeValue)attributeValue.get(i)).getDisplayValue();
+ singleValue = ((AttributeValue)attributeValue.get(i)).getDisplayValue(L10N);
singleValue = convertToDisplayFormat(singleValue, rmua);
value.add( singleValue );
}
Modified: trunk/src/sql/scarab-security.sql
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/sql/scarab-security.sql?view=diff&pathrev=10854&r1=10853&r2=10854
==============================================================================
--- trunk/src/sql/scarab-security.sql (original)
+++ trunk/src/sql/scarab-security.sql 2009-09-23 07:43:40-0700
@@ -64,6 +64,8 @@
INSERT INTO TURBINE_PERMISSION (PERMISSION_ID, PERMISSION_NAME)
VALUES (20, 'Issue | Delete');
+INSERT INTO TURBINE_PERMISSION (PERMISSION_ID, PERMISSION_NAME)
+ VALUES (22, 'Role | Request');
-- create a temporary table.
Added: trunk/src/sql/upgrade/upgrade-0.22-add-new-permissions.sql
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/sql/upgrade/upgrade-0.22-add-new-permissions.sql?view=markup&pathrev=10854
==============================================================================
--- (empty file)
+++ trunk/src/sql/upgrade/upgrade-0.22-add-new-permissions.sql 2009-09-23 07:43:40-0700
@@ -0,0 +1,2 @@
+INSERT INTO TURBINE_PERMISSION (PERMISSION_ID, PERMISSION_NAME)
+ VALUES (22, 'Role | Request');
\ No newline at end of file
Modified: trunk/src/webapp/WEB-INF/templates/macros/GlobalMacros.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/macros/GlobalMacros.vm?view=diff&pathrev=10854&r1=10853&r2=10854
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/macros/GlobalMacros.vm (original)
+++ trunk/src/webapp/WEB-INF/templates/macros/GlobalMacros.vm 2009-09-23 07:43:40-0700
@@ -1214,6 +1214,8 @@
#set ($field = $attVal.Attribute.AttributeType.ValidationKey)
#elseif ($att.isOptionAttribute())
#set ($field = "OptionId")
+ #elseif ($attVal.Attribute.AttributeType.Name == $scarabG.Constant.INTEGER)
+ #set ($field = "NumericValue")
#else
#set ($field = "Value")
#end
Modified: trunk/src/webapp/WEB-INF/templates/navigations/Administration.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/navigations/Administration.vm?view=diff&pathrev=10854&r1=10853&r2=10854
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/navigations/Administration.vm (original)
+++ trunk/src/webapp/WEB-INF/templates/navigations/Administration.vm 2009-09-23 07:43:40-0700
@@ -10,6 +10,7 @@
#set ($allowCP = $link.isAllowed("ChangePassword.vm")&& ($data.user.isUserAnonymous()==false))
#set ($allowUSI = $link.isAllowed("admin,UpdateSearchIndex.vm"))
#set ($allowCustomize = $data.user.isUserAnonymous()==false)
+#set ($allowXML = $link.isAllowed("admin,XMLExportIssues.vm"))
#if ($allowMUS || $allowAU || $allowMR || $allowAR || $allowGATS || $allowGAS || $allowMAT || $allowMM || $allowA || $allowCP || $allowUSI)
@@ -31,24 +32,35 @@
#end
#end
- #if ($allowA)
- <div>$link.setPage("admin,Approval.vm").setPathInfo($scarabG.Constant.CURRENT_ADMIN_MENU, "2").setLabel("$l10n.Approve")</div>
- #end
-
- #if ($allowMAT || $allowMM || $link.isAllowed("admin,XMLExportIssues.vm"))
- #if ($adminMenu.equals("3"))
- <div><strong>$l10n.CurrentModule</strong>
- $renderer.render("navigations", "ModuleAdmin.vm")
- </div>
- #else
- #if ($allowMAT && ! $allowMM)
- <div>$link.setPage("admin,ManageArtifactTypes.vm").setPathInfo($scarabG.Constant.CURRENT_ADMIN_MENU, "3").setLabel("$l10n.CurrentModule")</div>
- #else
- #if (!$data.user.CurrentModule.isGlobalModule())
- <div>$link.setPage("admin,ManageArtifactTypes.vm").setPathInfo($scarabG.Constant.CURRENT_ADMIN_MENU, "3").setLabel("$l10n.CurrentModule")</div>
- #end
- #end
- #end
+ ## obsolete old menu
+ ## #if ($allowA)
+ ## <div>$link.setPage("admin,Approval.vm").setPathInfo($scarabG.Constant.CURRENT_ADMIN_MENU, "2").setLabel("$l10n.Approve")</div>
+ ## #end
+
+ #if ($allowA || $allowMAT || $allowMM || $allowXML)
+ #if ($adminMenu.equals("3"))
+ <div><strong>$l10n.CurrentModule</strong>
+ $renderer.render("navigations", "ModuleAdmin.vm")
+ </div>
+ #else
+ #if ($allowMM)
+ <div>$link.setPage("SelectModule.vm").setPathInfo($scarabG.Constant.CURRENT_ADMIN_MENU, "3").setLabel("$l10n.CurrentModule")</div>
+ #else
+ #if ($allowMAT)
+ <div>$link.setPage("admin,ManageArtifactTypes.vm").setPathInfo($scarabG.Constant.CURRENT_ADMIN_MENU, "3").setLabel("$l10n.CurrentModule")</div>
+ #else
+ #if ($allowXML)
+ <div>$link.setPage("admin,XMLImportIssues.vm").setPathInfo($scarabG.Constant.CURRENT_ADMIN_MENU, "3").setLabel("$l10n.CurrentModule")</div>
+ #else
+ #if ($allowA)
+ <div>$link.setPage("admin,Approval.vm").setPathInfo($scarabG.Constant.CURRENT_ADMIN_MENU, "3").setLabel("$l10n.CurrentModule")</div>
+ #else
+ ## nothing, should never happen
+ #end
+ #end
+ #end
+ #end
+ #end
#end
#if ($allowMR || $allowAR)
Modified: trunk/src/webapp/WEB-INF/templates/navigations/CommonLinks.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/navigations/CommonLinks.vm?view=diff&pathrev=10854&r1=10853&r2=10854
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/navigations/CommonLinks.vm (original)
+++ trunk/src/webapp/WEB-INF/templates/navigations/CommonLinks.vm 2009-09-23 07:43:40-0700
@@ -83,7 +83,7 @@
#if ($issueType.canCreateIssueInScope($user, $module))
#set ($rmit = $module.getRModuleIssueType($issueType))
#set ($pagelink = $scarabR.getNextEntryTemplate($issueType))
- <div><a href="$link.setPage($pagelink).addPathInfo($scarabG.Constant.CURRENT_ISSUE_TYPE, $issueType.QueryKey).addPathInfo("eventSubmit_doStart", "foo").setAction("ReportIssue")">$l10n.format('NewIssueType', $rmit.DisplayName)</a></div>
+ <div><a href="$link.setPage($pagelink).addPathInfo($scarabG.Constant.CURRENT_ISSUE_TYPE, $issueType.QueryKey).addPathInfo("eventSubmit_doStart", "foo").setAction("ReportIssue")">$rmit.DisplayName</a></div>
#end
#end
@@ -172,4 +172,4 @@
#end
</div>
</div>
-
\ No newline at end of file
+
Modified: trunk/src/webapp/WEB-INF/templates/navigations/ModuleAdmin.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/navigations/ModuleAdmin.vm?view=diff&pathrev=10854&r1=10853&r2=10854
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/navigations/ModuleAdmin.vm (original)
+++ trunk/src/webapp/WEB-INF/templates/navigations/ModuleAdmin.vm 2009-09-23 07:43:40-0700
@@ -1,5 +1,19 @@
+#set ($allowA = $link.isAllowed("admin,Approval.vm"))
+#set ($allowXML = $link.isAllowed("admin,XMLExportIssues.vm"))
+#set ($allowMAT = $link.isAllowed("admin,ManageArtifactTypes.vm"))
+#set ($allowMM = $link.isAllowed("admin,ManageModules.vm"))
+
+#if ($allowMAT)
<div>$link.setPage("admin,ManageArtifactTypes.vm").setLabel("$l10n.NavManageIssueTypes")</div>
+#end
+#if ($allowXML)
<div>$link.setPage("admin,XMLImportIssues.vm").setLabel("$l10n.XMLImportIssues")</div>
<div>$link.setPage("admin,XMLExportIssues.vm").setLabel("$l10n.XMLExportIssues")</div>
<div>$link.setPage("admin,XMLExportSettings.vm").setLabel("$l10n.XMLExportSettings")</div>
+#end
+#if ($allowMM)
<div>$link.setPage("SelectModule.vm").setLabel("$l10n.ChangeModule")</div>
+#end
+#if ($allowA)
+ <div>$link.setPage("admin,Approval.vm").setLabel("$l10n.Approve")</div>
+#end
\ No newline at end of file
Modified: trunk/src/webapp/WEB-INF/templates/screens/RequestRoles.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/screens/RequestRoles.vm?view=diff&pathrev=10854&r1=10853&r2=10854
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/screens/RequestRoles.vm (original)
+++ trunk/src/webapp/WEB-INF/templates/screens/RequestRoles.vm 2009-09-23 07:43:40-0700
@@ -8,6 +8,7 @@
#else
#set ($acl = $user.getACL())
+#set ($anonymousrolename = $scarabG.getTurbineConfiguration().getString("scarab.anonymous.rolename"))
<form method="post" action="$link.setPage("SelectModule.vm")">
<input type="hidden" name="action" value="HandleRoleRequests" />
@@ -21,9 +22,11 @@
 
</td>
#foreach ($role in $securityAdmin.NonRootRoles)
- <td bgcolor="#ffffff">
- <b>$role.Name</b>
- </td>
+ #if ($role.Name != $anonymousrolename)
+ <td bgcolor="#ffffff">
+ <b>$role.Name</b>
+ </td>
+ #end
#end
<td bgcolor="#ffffff">
<i>$l10n.ClearRequest</i>
@@ -43,33 +46,33 @@
<b>$group.Name</b>
</td>
#foreach ($role in $securityAdmin.NonRootRoles)
- #if ($acl.hasRole($role,$group))
- <td>
- <center>
- <input type="checkbox" disabled="1" checked="1" />
- </center>
- </td>
- #else
- #if ($role.Name != $anonymousrolename)
- #set ($disabled = "false")
- #set ($checked = "false")
- #set ($name = "${group.ModuleId}")
- #if ($securityAdmin.hasRequestedRole($user, $role, $group))
- #set ($checked = "checked")
- #set ($name = "dis_$name")
- #set ($disabled = "disabled")
+ #if ($role.Name != $anonymousrolename)
+ #if ($acl.hasRole($role,$group))
+ <td>
+ <center>
+ <input type="checkbox" disabled="1" checked="1" />
+ </center>
+ </td>
+ #else
+ #set ($disabled = "false")
+ #set ($checked = "false")
+ #set ($name = "${group.ModuleId}")
+ #if ($securityAdmin.hasRequestedRole($user, $role, $group))
+ #set ($checked = "checked")
+ #set ($name = "dis_$name")
+ #set ($disabled = "disabled")
+ #end
+ <td>
+ <center>
+ <input type="radio" name="${name}"
+ value="${role.Name}"
+ #if (${checked} != "false") checked="1" #end
+ #if (${disabled} != "false") disabled="1" #end
+ />
+ </center>
+ </td>
#end
- <td>
- <center>
- <input type="radio" name="${name}"
- value="${role.Name}"
- #if (${checked} != "false") checked="1" #end
- #if (${disabled} != "false") disabled="1" #end
- />
- </center>
- </td>
- #end
- #end
+ #end
#end
<td><center><input type="radio" name="${group.ModuleId}" value="0"></center></td>
</tr>
Modified: trunk/src/webapp/WEB-INF/templates/screens/admin/AttributeOptionSelect.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/screens/admin/AttributeOptionSelect.vm?view=diff&pathrev=10854&r1=10853&r2=10854
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/screens/admin/AttributeOptionSelect.vm (original)
+++ trunk/src/webapp/WEB-INF/templates/screens/admin/AttributeOptionSelect.vm 2009-09-23 07:43:40-0700
@@ -22,7 +22,7 @@
<input type="submit" value="$l10n.Add" name="eventSubmit_doSelectattributeoption" /> 
#end
#if ($canEditDomain)
-<input type="submit" value="$l10n.CreateNew" name="eventSubmit_doGotoothertemplate" /> 
+##<input type="submit" value="$l10n.CreateNew" name="eventSubmit_doGotoothertemplate" /> 
#end
<input type="submit" value="$l10n.Cancel" name="eventSubmit_doCancel" /> 
</div>
@@ -52,7 +52,7 @@
<input type="submit" value="$l10n.Add" name="eventSubmit_doSelectattributeoption" /> 
#end
#if ($canEditDomain)
-<input type="submit" value="$l10n.CreateNew" name="eventSubmit_doGotoothertemplate" /> 
+##<input type="submit" value="$l10n.CreateNew" name="eventSubmit_doGotoothertemplate" /> 
#end
<input type="submit" value="$l10n.Cancel" name="eventSubmit_doCancel" /> 
</div>
Modified: trunk/src/webapp/WEB-INF/templates/screens/admin/AttributeSelect.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/screens/admin/AttributeSelect.vm?view=diff&pathrev=10854&r1=10853&r2=10854
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/screens/admin/AttributeSelect.vm (original)
+++ trunk/src/webapp/WEB-INF/templates/screens/admin/AttributeSelect.vm 2009-09-23 07:43:40-0700
@@ -17,7 +17,7 @@
<input type="submit" value="$l10n.Add" name="eventSubmit_doSelectattribute" />
#end
#if ($canEditDomain)
- <input type="submit" value="$l10n.CreateNew" name="eventSubmit_doCreatenewglobalattribute"/> 
+ ##<input type="submit" value="$l10n.CreateNew" name="eventSubmit_doCreatenewglobalattribute"/> 
#end
<input type="submit" value="$l10n.Cancel" name="eventSubmit_doCancel"/>
</div>
Modified: trunk/src/webapp/WEB-INF/templates/screens/admin/UserAttributeSelect.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/screens/admin/UserAttributeSelect.vm?view=diff&pathrev=10854&r1=10853&r2=10854
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/screens/admin/UserAttributeSelect.vm (original)
+++ trunk/src/webapp/WEB-INF/templates/screens/admin/UserAttributeSelect.vm 2009-09-23 07:43:40-0700
@@ -6,7 +6,7 @@
<input type="submit" value="$l10n.AddSelectedToModule" name="eventSubmit_doSelectuserattribute" />
#end
#if ($canEditDomain)
- <input type="submit" value="$l10n.CreateNew" name="eventSubmit_doCreatenewuserattribute"/> 
+ ##<input type="submit" value="$l10n.CreateNew" name="eventSubmit_doCreatenewuserattribute"/> 
#end
<input type="submit" value="$l10n.Cancel" name="eventSubmit_doCancel"/>
</div>
Modified: trunk/src/webapp/WEB-INF/templates/screens/entry/Wizard3.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/screens/entry/Wizard3.vm?view=diff&pathrev=10854&r1=10853&r2=10854
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/screens/entry/Wizard3.vm (original)
+++ trunk/src/webapp/WEB-INF/templates/screens/entry/Wizard3.vm 2009-09-23 07:43:40-0700
@@ -116,9 +116,9 @@
#end
#mimeTypeOptions($mimeA)
</select>
- <p><small>$l10n.Other  
+ <p><small>$l10n.CustomMimeType:
<input type="text" name="$intakeAttachment.MimeTypeB.Key"
- value="$intakeAttachment.MimeTypeB" />$l10n.CloseParenth</small></p>
+ value="$intakeAttachment.MimeTypeB" /></small></p>
#fieldErrorMsg($intakeAttachment.MimeTypeA "")
</td>
</tr>
------------------------------------------------------
http://scarab.tigris.org/ds/viewMessage.do?dsForumId=3577&dsMessageId=2398911