Scarab commit: svn commit: r11012 - branches/release/0.22/src: java/org/tigris/scarab/om sql sql/mysql/upgrade sql/oracle/upgrade sql/postgresql/upgrade webapp/WEB-INF/templates/screens/admin
[email protected] Wed, 5 May 2010 04:44:58 -0700 (PDT)
| Newsgroups | gmane.comp.java.scarab.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: jhoech
Date: 2010-05-05 04:44:58-0700
New Revision: 11012
Modified:
branches/release/0.22/src/java/org/tigris/scarab/om/GlobalParameterManager.java
branches/release/0.22/src/sql/mysql/upgrade/mysql-upgrade-1.0b13-1.0b14-10.sql
branches/release/0.22/src/sql/oracle/upgrade/oracle-upgrade-1.0b13-1.0b14-101.sql
branches/release/0.22/src/sql/postgresql/upgrade/postgresql-upgrade-1.0b13-1.0b14-10.sql
branches/release/0.22/src/sql/scarab-required-data.sql
branches/release/0.22/src/webapp/WEB-INF/templates/screens/admin/ModifyModule.vm
Log:
CHG - Changed value for boolean values in table SCARAB_GLOBAL_PARAMETER in scarab's database from single characters into long form. Short form is kept for backwards compatibility.
Modified: branches/release/0.22/src/java/org/tigris/scarab/om/GlobalParameterManager.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/0.22/src/java/org/tigris/scarab/om/GlobalParameterManager.java?view=diff&pathrev=11012&r1=11011&r2=11012
==============================================================================
--- branches/release/0.22/src/java/org/tigris/scarab/om/GlobalParameterManager.java (original)
+++ branches/release/0.22/src/java/org/tigris/scarab/om/GlobalParameterManager.java 2010-05-05 04:44:58-0700
@@ -86,7 +86,7 @@
private static boolean toBoolean(String booleanValue)
{
return(
- booleanValue.equalsIgnoreCase("T")
+ booleanValue.equalsIgnoreCase("T") //Reading simple characters as boolean, is kept for backwards compatibility only.
|| booleanValue.equalsIgnoreCase("TRUE")
);
}
@@ -322,7 +322,7 @@
public static boolean getBooleanFromHierarchy(String name, Module module, boolean def)
throws TorqueException
{
- String defAsString = (def)? "T":"F";
+ String defAsString = (def)? "TRUE":"FALSE";
return toBoolean(getStringFromHierarchy(name, module, defAsString ));
}
@@ -330,13 +330,13 @@
public static void setBoolean(String name, boolean value)
throws TorqueException
{
- setString(name, (value ? "T" : "F"));
+ setString(name, (value ? "TRUE" : "FALSE"));
}
public static void setBoolean(String name, Module module, boolean value)
throws TorqueException
{
- setString(name, module, (value ? "T" : "F"));
+ setString(name, module, (value ? "TRUE" : "FALSE"));
}
/**
Modified: branches/release/0.22/src/sql/mysql/upgrade/mysql-upgrade-1.0b13-1.0b14-10.sql
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/0.22/src/sql/mysql/upgrade/mysql-upgrade-1.0b13-1.0b14-10.sql?view=diff&pathrev=11012&r1=11011&r2=11012
==============================================================================
--- branches/release/0.22/src/sql/mysql/upgrade/mysql-upgrade-1.0b13-1.0b14-10.sql (original)
+++ branches/release/0.22/src/sql/mysql/upgrade/mysql-upgrade-1.0b13-1.0b14-10.sql 2010-05-05 04:44:58-0700
@@ -1,7 +1,7 @@
/*
* Adds email configuration.
*/
-insert into SCARAB_GLOBAL_PARAMETER values (2, 'email-enabled', 'T', NULL);
-insert into SCARAB_GLOBAL_PARAMETER values (3, 'email-include-issue-details', 'T', NULL);
-insert into SCARAB_GLOBAL_PARAMETER values (4, 'email-allow-module-overrides', 'T', NULL);
+insert into SCARAB_GLOBAL_PARAMETER values (2, 'email-enabled', 'TRUE', NULL);
+insert into SCARAB_GLOBAL_PARAMETER values (3, 'email-include-issue-details', 'TRUE', NULL);
+insert into SCARAB_GLOBAL_PARAMETER values (4, 'email-allow-module-overrides', 'TRUE', NULL);
Modified: branches/release/0.22/src/sql/oracle/upgrade/oracle-upgrade-1.0b13-1.0b14-101.sql
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/0.22/src/sql/oracle/upgrade/oracle-upgrade-1.0b13-1.0b14-101.sql?view=diff&pathrev=11012&r1=11011&r2=11012
==============================================================================
Binary files. No diff available.
Modified: branches/release/0.22/src/sql/postgresql/upgrade/postgresql-upgrade-1.0b13-1.0b14-10.sql
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/0.22/src/sql/postgresql/upgrade/postgresql-upgrade-1.0b13-1.0b14-10.sql?view=diff&pathrev=11012&r1=11011&r2=11012
==============================================================================
--- branches/release/0.22/src/sql/postgresql/upgrade/postgresql-upgrade-1.0b13-1.0b14-10.sql (original)
+++ branches/release/0.22/src/sql/postgresql/upgrade/postgresql-upgrade-1.0b13-1.0b14-10.sql 2010-05-05 04:44:58-0700
@@ -1,7 +1,7 @@
/*
* Adds email configuration.
*/
-insert into SCARAB_GLOBAL_PARAMETER values (2, 'email-enabled', 'T', NULL);
-insert into SCARAB_GLOBAL_PARAMETER values (3, 'email-include-issue-details', 'T', NULL);
-insert into SCARAB_GLOBAL_PARAMETER values (4, 'email-allow-module-overrides', 'T', NULL);
+insert into SCARAB_GLOBAL_PARAMETER values (2, 'email-enabled', 'TRUE', NULL);
+insert into SCARAB_GLOBAL_PARAMETER values (3, 'email-include-issue-details', 'TRUE', NULL);
+insert into SCARAB_GLOBAL_PARAMETER values (4, 'email-allow-module-overrides', 'TRUE', NULL);
Modified: branches/release/0.22/src/sql/scarab-required-data.sql
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/0.22/src/sql/scarab-required-data.sql?view=diff&pathrev=11012&r1=11011&r2=11012
==============================================================================
--- branches/release/0.22/src/sql/scarab-required-data.sql (original)
+++ branches/release/0.22/src/sql/scarab-required-data.sql 2010-05-05 04:44:58-0700
@@ -119,6 +119,6 @@
-- global application parameters, we start off needing to be localized
insert into SCARAB_GLOBAL_PARAMETER (PARAMETER_ID, NAME, VALUE)
values (1, 'db-l10n-state', 'pre-l10n');
-insert into SCARAB_GLOBAL_PARAMETER values (2, 'email-enabled', 'T', NULL);
-insert into SCARAB_GLOBAL_PARAMETER values (3, 'email-include-issue-details', 'T', NULL);
-insert into SCARAB_GLOBAL_PARAMETER values (4, 'email-allow-module-overrides', 'T', NULL);
+insert into SCARAB_GLOBAL_PARAMETER values (2, 'email-enabled', 'TRUE', NULL);
+insert into SCARAB_GLOBAL_PARAMETER values (3, 'email-include-issue-details', 'TRUE', NULL);
+insert into SCARAB_GLOBAL_PARAMETER values (4, 'email-allow-module-overrides', 'TRUE', NULL);
Modified: branches/release/0.22/src/webapp/WEB-INF/templates/screens/admin/ModifyModule.vm
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/0.22/src/webapp/WEB-INF/templates/screens/admin/ModifyModule.vm?view=diff&pathrev=11012&r1=11011&r2=11012
==============================================================================
--- branches/release/0.22/src/webapp/WEB-INF/templates/screens/admin/ModifyModule.vm (original)
+++ branches/release/0.22/src/webapp/WEB-INF/templates/screens/admin/ModifyModule.vm 2010-05-05 04:44:58-0700
@@ -214,8 +214,8 @@
#if (!$isGlobal)
<option value="" #if ($inherited) selected #end>$l10n.Default</option>
#end
- <option value="T" #if (!$inherited && $selected) selected #end>$l10n.Yes</option>
- <option value="F" #if (!$inherited && !$selected) selected #end>$l10n.No</option>
+ <option value="TRUE" #if (!$inherited && $selected) selected #end>$l10n.Yes</option>
+ <option value="FALSE" #if (!$inherited && !$selected) selected #end>$l10n.No</option>
</select>
#if (!$isGlobal) $l10n.ReasonFieldRequiredExplained #end
</td>
------------------------------------------------------
http://scarab.tigris.org/ds/viewMessage.do?dsForumId=3577&dsMessageId=2603349