Scarab commit: svn commit: r11115 - branches/release/1.0.22/src/java/org/tigris/scarab: om screens

Author: mcoss
Date: 2012-04-13 01:36:32-0700
New Revision: 11115

Modified:
   branches/release/1.0.22/src/java/org/tigris/scarab/om/AbstractScarabUser.java
   branches/release/1.0.22/src/java/org/tigris/scarab/screens/ModuleSwitchingLink.java

Log:
FIX - Fix for module's home page, which is now preselected. This is meant to be necessary, to avoid invalid data in, by user more or less randomly generated, target pages.

Modified: branches/release/1.0.22/src/java/org/tigris/scarab/om/AbstractScarabUser.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/1.0.22/src/java/org/tigris/scarab/om/AbstractScarabUser.java?view=diff&pathrev=11115&r1=11114&r2=11115
==============================================================================
--- branches/release/1.0.22/src/java/org/tigris/scarab/om/AbstractScarabUser.java	(original)
+++ branches/release/1.0.22/src/java/org/tigris/scarab/om/AbstractScarabUser.java	2012-04-13 01:36:32-0700
@@ -92,7 +92,7 @@
         "getRModuleUserAttribute";
 
     private static final String[] HOME_PAGES = {"home,EnterNew.vm", 
-        "query", "Index.vm"};
+        /*"query",*/ "Index.vm"};
 
     private static final int MAX_INDEPENDENT_WINDOWS = 10;
 
@@ -772,30 +772,36 @@
                 {
                     homePage = "SelectModule.vm";
                 }
-                else if ("query".equals(homePage))
+                /*
+                 * Disabled user several home pages for module switch [by mcoss], as
+                 * feature gave not the correct results. The cause was that the by this feature 
+                 * selected "random" target pages sometimes contain invalid data.
+                 */
+                 else if ("query".equals(homePage))
                 {
-                    homePage = getQueryTarget();
+                    homePage = HOME_PAGES[0];//getQueryTarget();
                 }
                 else if ("matrix".equals(homePage))
                 {
-                    homePage = getMatrixTarget();
+                    homePage = HOME_PAGES[0];//getMatrixTarget();
                 }
                 // protect against removal of old screens
                 else if (homePage != null && 
                     (homePage.endsWith("ModuleQuery.vm") ||
                      homePage.endsWith("XModuleList.vm"))) 
                 {
-                    homePage = getQueryTarget();
+                    homePage = HOME_PAGES[0];//getQueryTarget();
                 }
 
                 int i = 0;
                 while (homePage == null || !isHomePageValid(homePage, module)) 
                 {
                     homePage = HOME_PAGES[i++];
-                    if ("query".equals(homePage)) 
+                    /* Obsolete as value "query" was commented
+                     * if ("query".equals(homePage)) 
                     {
                         homePage = getQueryTarget();
-                    }
+                    }*/
                 }
             }
         }
@@ -1765,4 +1771,4 @@
         this.showOtherModulesInIssueTypeList = 
             newShowOtherModulesInIssueTypeList;
     }
-}
+}
\ No newline at end of file

Modified: branches/release/1.0.22/src/java/org/tigris/scarab/screens/ModuleSwitchingLink.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/1.0.22/src/java/org/tigris/scarab/screens/ModuleSwitchingLink.java?view=diff&pathrev=11115&r1=11114&r2=11115
==============================================================================
--- branches/release/1.0.22/src/java/org/tigris/scarab/screens/ModuleSwitchingLink.java	(original)
+++ branches/release/1.0.22/src/java/org/tigris/scarab/screens/ModuleSwitchingLink.java	2012-04-13 01:36:32-0700
@@ -38,7 +38,7 @@
      */
     public TemplateLink setPage(String moduleId)
     {
-        String homePage = null;
+        String homePage = "Index.vm";
         try
         {
             Module module = ModuleManager

------------------------------------------------------
http://scarab.tigris.org/ds/viewMessage.do?dsForumId=3577&dsMessageId=2947964