Author: jorgeuriarte
Date: 2006-08-31 07:43:23-0700
New Revision: 10275
Added:
trunk/src/java/org/tigris/scarab/screens/IssueTypeList.java
- copied unchanged from r10265, /branches/release/b21/src/java/org/tigris/scarab/screens/IssueTypeList.java
Modified:
trunk/src/conf/classes/ScarabBundle_en.properties
trunk/src/conf/classes/ScarabBundle_es.properties
trunk/src/java/org/tigris/scarab/om/AbstractScarabUser.java
trunk/src/java/org/tigris/scarab/om/UserPreference.java
trunk/src/java/org/tigris/scarab/pipeline/FreshenUserValve.java
trunk/src/java/org/tigris/scarab/tools/ScarabRequestTool.java
trunk/src/java/org/tigris/scarab/tools/localization/L10NKeySet.java
trunk/src/java/org/tigris/scarab/util/word/QueryResult.java
trunk/src/webapp/WEB-INF/templates/screens/IssueTypeList.vm
trunk/src/webapp/WEB-INF/templates/screens/QueryMatrix.vm
Log:
Merged revisions 10260-10261,10263-10265 via svnmerge from
http://scarab.tigris.org/svn/scarab/branches/release/b21
........
r10260 | jorgeuriarte | 2006-08-27 00:13:41 +0200 (Sun, 27 Aug 2006) | 5 lines
Fixes two problems in the column selection screen in search results:
- RSSDataExport was not considered, and MIT list was being removed.
- EMPTY_LIST (inmutable!) replaced with 'new ArrayList()', because this list should be modified in populateInternalAttributes().
........
r10261 | jorgeuriarte | 2006-08-27 12:11:29 +0200 (Sun, 27 Aug 2006) | 1 line
Make sure non-anonymou users will not save their user-preferences.
........
r10264 | jorgeuriarte | 2006-08-27 17:37:01 +0200 (Sun, 27 Aug 2006) | 5 lines
Fixed problem when homepage was querymatrix but no module was selected.
Also; the querymatrix will not be displayed if no issuetypes are availaible,
showing an alert message.
........
r10265 | jorgeuriarte | 2006-08-28 18:19:54 +0200 (Mon, 28 Aug 2006) | 1 line
Fixes SCB1878 'Duplicates checking broken'. populateInternalAttributes crashed if no preferences-list was passed as parameter.
........
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&rev=10275&p1=trunk/src/conf/classes/ScarabBundle_en.properties&p2=trunk/src/conf/classes/ScarabBundle_en.properties&r1=10274&r2=10275
==============================================================================
--- trunk/src/conf/classes/ScarabBundle_en.properties (original)
+++ trunk/src/conf/classes/ScarabBundle_en.properties 2006-08-31 07:43:23-0700
@@ -724,6 +724,7 @@
StartListFromSaved=Build new list
SavedListsOfIssueTypes=Saved lists of issue types
NoIssueTypeSelected=No issue types have been selected. Please select from the list below.
+NoIssueTypesAssociatedToModule=No issue type have been associated to this module. Please contact the administrator.
SelectSaveXModuleQuery=Saved issue type lists...
SelectSaveXModuleReport=Saved issue type lists...
NoSavedIssueTypeLists=There are no saved issue type lists
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&rev=10275&p1=trunk/src/conf/classes/ScarabBundle_es.properties&p2=trunk/src/conf/classes/ScarabBundle_es.properties&r1=10274&r2=10275
==============================================================================
--- trunk/src/conf/classes/ScarabBundle_es.properties (original)
+++ trunk/src/conf/classes/ScarabBundle_es.properties 2006-08-31 07:43:23-0700
@@ -704,6 +704,7 @@
StartListFromSaved = Construir nueva lista
SavedListsOfIssueTypes = Listas guardadas
NoIssueTypeSelected = No se seleccionaron tipos de petición.
+NoIssueTypesAssociatedToModule=No se ha asociado ningún tipo de petición a este módulo. Contacte con el administrador.
SelectSaveXModuleQuery = Selecciona una consulta sobre varios módulos guardada...
SelectSaveXModuleReport = Listas de tipos de petición guardadas...
NoSavedIssueTypeLists = No hay listas de tipos de petición guardadas
Modified: trunk/src/java/org/tigris/scarab/om/AbstractScarabUser.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/om/AbstractScarabUser.java?view=diff&rev=10275&p1=trunk/src/java/org/tigris/scarab/om/AbstractScarabUser.java&p2=trunk/src/java/org/tigris/scarab/om/AbstractScarabUser.java&r1=10274&r2=10275
==============================================================================
--- trunk/src/java/org/tigris/scarab/om/AbstractScarabUser.java (original)
+++ trunk/src/java/org/tigris/scarab/om/AbstractScarabUser.java 2006-08-31 07:43:23-0700
@@ -766,7 +766,11 @@
UserPreference up = UserPreferenceManager.getInstance(uid);
homePage = up.getHomePage();
- if ("query".equals(homePage))
+ if (module == null)
+ {
+ homePage = "SelectModule.vm";
+ }
+ else if ("query".equals(homePage))
{
homePage = getQueryTarget();
}
Modified: trunk/src/java/org/tigris/scarab/om/UserPreference.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/om/UserPreference.java?view=diff&rev=10275&p1=trunk/src/java/org/tigris/scarab/om/UserPreference.java&p2=trunk/src/java/org/tigris/scarab/om/UserPreference.java&r1=10274&r2=10275
==============================================================================
--- trunk/src/java/org/tigris/scarab/om/UserPreference.java (original)
+++ trunk/src/java/org/tigris/scarab/om/UserPreference.java 2006-08-31 07:43:23-0700
@@ -1,5 +1,7 @@
package org.tigris.scarab.om;
+import org.apache.torque.TorqueException;
+
/* ================================================================
* Copyright (c) 2000-2005 CollabNet. All rights reserved.
*
@@ -71,4 +73,15 @@
super.setLocale((locale != null && locale.length() > 255)
? locale.substring(0, 255) : locale);
}
+
+ /**
+ * Makes sure only non-anonymous users will upgrade their configuration.
+ */
+ public void save() throws TorqueException
+ {
+ if (!this.getScarabUser().isUserAnonymous())
+ {
+ super.save();
+ }
+ }
}
Modified: trunk/src/java/org/tigris/scarab/pipeline/FreshenUserValve.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/pipeline/FreshenUserValve.java?view=diff&rev=10275&p1=trunk/src/java/org/tigris/scarab/pipeline/FreshenUserValve.java&p2=trunk/src/java/org/tigris/scarab/pipeline/FreshenUserValve.java&r1=10274&r2=10275
==============================================================================
--- trunk/src/java/org/tigris/scarab/pipeline/FreshenUserValve.java (original)
+++ trunk/src/java/org/tigris/scarab/pipeline/FreshenUserValve.java 2006-08-31 07:43:23-0700
@@ -85,6 +85,7 @@
XMIT_SCREENS.put("AdvancedQuery.vm", null);
XMIT_SCREENS.put("Search.vm", null);
XMIT_SCREENS.put("IssueList.vm", null);
+ XMIT_SCREENS.put("RSSDataExport.vm", null);
XMIT_SCREENS.put("ViewIssue.vm", null);
XMIT_SCREENS.put("QueryList.vm", null);
XMIT_SCREENS.put("SaveQuery.vm", null);
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&rev=10275&p1=trunk/src/java/org/tigris/scarab/tools/ScarabRequestTool.java&p2=trunk/src/java/org/tigris/scarab/tools/ScarabRequestTool.java&r1=10274&r2=10275
==============================================================================
--- trunk/src/java/org/tigris/scarab/tools/ScarabRequestTool.java (original)
+++ trunk/src/java/org/tigris/scarab/tools/ScarabRequestTool.java 2006-08-31 07:43:23-0700
@@ -726,7 +726,7 @@
}
if (result == null)
{
- result = Collections.EMPTY_LIST;
+ result = new ArrayList();
}
return result;
}
Modified: trunk/src/java/org/tigris/scarab/tools/localization/L10NKeySet.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/tools/localization/L10NKeySet.java?view=diff&rev=10275&p1=trunk/src/java/org/tigris/scarab/tools/localization/L10NKeySet.java&p2=trunk/src/java/org/tigris/scarab/tools/localization/L10NKeySet.java&r1=10274&r2=10275
==============================================================================
--- trunk/src/java/org/tigris/scarab/tools/localization/L10NKeySet.java (original)
+++ trunk/src/java/org/tigris/scarab/tools/localization/L10NKeySet.java 2006-08-31 07:43:23-0700
@@ -168,6 +168,7 @@
public static final LocalizationKey YouHaveBeenLoggedOut = new L10NKey("YouHaveBeenLoggedOut");
public static final LocalizationKey AutomaticallyLoggedIn = new L10NKey("AutomaticallyLoggedIn");
public static final LocalizationKey ConditionallyRequiredUserAttribute = new L10NKey("ConditionallyRequiredUserAttribute");
+ public static final LocalizationKey NoIssueTypesAssociatedToModule = new L10NKey("NoIssueTypesAssociatedToModule");
// Experts notifications:
// The following set is only used in logging. They are intended for
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&rev=10275&p1=trunk/src/java/org/tigris/scarab/util/word/QueryResult.java&p2=trunk/src/java/org/tigris/scarab/util/word/QueryResult.java&r1=10274&r2=10275
==============================================================================
--- trunk/src/java/org/tigris/scarab/util/word/QueryResult.java (original)
+++ trunk/src/java/org/tigris/scarab/util/word/QueryResult.java 2006-08-31 07:43:23-0700
@@ -242,6 +242,12 @@
*/
public void populateInternalAttributes(List preferences, ScarabLocalizationTool l10n)
{
+ if (preferences == null)
+ {
+ // No preferences, no need to do anything
+ return;
+ }
+
if (l10n == null)
{
l10n = new ScarabLocalizationTool();
Modified: trunk/src/webapp/WEB-INF/templates/screens/IssueTypeList.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/screens/IssueTypeList.vm?view=diff&rev=10275&p1=trunk/src/webapp/WEB-INF/templates/screens/IssueTypeList.vm&p2=trunk/src/webapp/WEB-INF/templates/screens/IssueTypeList.vm&r1=10274&r2=10275
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/screens/IssueTypeList.vm (original)
+++ trunk/src/webapp/WEB-INF/templates/screens/IssueTypeList.vm 2006-08-31 07:43:23-0700
@@ -1,9 +1,17 @@
+##
+## This template expects some context variables from the java screen class:
+## - $issueTypesAvailaible: if FALSE, current module has no associated issuetypes
+## and so querymatrix cannot be displayed.
+##
+## TODO: Where is this template used from? Is it redundant with QueryMatrix.vm?
+##
+
#set ($user = $data.User)
$user.setHomePage("matrix")
<div class="app" id="xmodulelist">
- #if ($user.hasAnySearchableRMITs())
+ #if ($user.hasAnySearchableRMITs() && $issueTypesAvailaible)
#renderQueryMatrix()
#else
<p><em>$l10n.NoMoreIssueTypes</em></p>
Modified: trunk/src/webapp/WEB-INF/templates/screens/QueryMatrix.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/screens/QueryMatrix.vm?view=diff&rev=10275&p1=trunk/src/webapp/WEB-INF/templates/screens/QueryMatrix.vm&p2=trunk/src/webapp/WEB-INF/templates/screens/QueryMatrix.vm&r1=10274&r2=10275
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/screens/QueryMatrix.vm (original)
+++ trunk/src/webapp/WEB-INF/templates/screens/QueryMatrix.vm 2006-08-31 07:43:23-0700
@@ -1,9 +1,16 @@
+##
+## This template expects some context variables from the java screen class:
+## - $issueTypesAvailaible: if FALSE, current module has no associated issuetypes
+## and so querymatrix cannot be displayed.
+##
+## TODO: Where is this template used from? Is it redundant with IssueTypeList.vm?
+##
#set ($user = $data.User)
$user.setHomePage("matrix")
$user.setCurrentMITList(null)
<div class="app" id="xmodulelist">
- #if ($user.hasAnySearchableRMITs())
+ #if ($user.hasAnySearchableRMITs() && $issueTypesAvailaible)
#renderQueryMatrix()
#else
<p><em>$l10n.NoMoreIssueTypes</em></p>
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.