[Aplaws-commit] r1005 - releases/1.0.3/ccm-cms/src/com/arsdigita/cms/ui

[<ap...@vh...>]

Author: apevec
Date: 2005-11-18 23:03:26 +0100 (Fri, 18 Nov 2005)
New Revision: 1005

Modified:
   releases/1.0.3/ccm-cms/src/com/arsdigita/cms/ui/TasksPanel.java
Log:
integrated -r1002 from trunk: "lock" is default task filter when request parameter is not present


Modified: releases/1.0.3/ccm-cms/src/com/arsdigita/cms/ui/TasksPanel.java
===================================================================
--- releases/1.0.3/ccm-cms/src/com/arsdigita/cms/ui/TasksPanel.java	2005-11-18 18:08:55 UTC (rev 1004)
+++ releases/1.0.3/ccm-cms/src/com/arsdigita/cms/ui/TasksPanel.java	2005-11-18 22:03:26 UTC (rev 1005)
@@ -284,13 +284,13 @@
 
                     String lockFilterType = getLockFilterType(state);
 
-                    if ( lockFilterType.equals("all") ) {
-                        m_viewLockLabel.setVisible(state,false);
-                        m_viewLockLink.setVisible(state,true);
+                    if ( lockFilterType.equals("lock") ) {
+                        m_viewLockLabel.setVisible(state,true);
+                        m_viewLockLink.setVisible(state,false);
                         m_viewUnlockLabel.setVisible(state,false);
                         m_viewUnlockLink.setVisible(state,true);
-                        m_viewAllLockLabel.setVisible(state,true);
-                        m_viewAllLockLink.setVisible(state,false);
+                        m_viewAllLockLabel.setVisible(state,false);
+                        m_viewAllLockLink.setVisible(state,true);
                     } else if ( lockFilterType.equals("unlock") ) {
                         m_viewLockLabel.setVisible(state,false);
                         m_viewLockLink.setVisible(state,true);
@@ -298,13 +298,13 @@
                         m_viewUnlockLink.setVisible(state,false);
                         m_viewAllLockLabel.setVisible(state,false);
                         m_viewAllLockLink.setVisible(state,true);
-                    } else { // default is "lock"
-                        m_viewLockLabel.setVisible(state,true);
-                        m_viewLockLink.setVisible(state,false);
+                    } else {
+                        m_viewLockLabel.setVisible(state,false);
+                        m_viewLockLink.setVisible(state,true);
                         m_viewUnlockLabel.setVisible(state,false);
                         m_viewUnlockLink.setVisible(state,true);
-                        m_viewAllLockLabel.setVisible(state,false);
-                        m_viewAllLockLink.setVisible(state,true);
+                        m_viewAllLockLabel.setVisible(state,true);
+                        m_viewAllLockLink.setVisible(state,false);
                     }
                 }
             });
@@ -360,7 +360,7 @@
     protected String getLockFilterType(PageState state) {
         String lockFilterType = (String)state.getValue(m_lockFilterParam);
         if ( lockFilterType == null || lockFilterType.equals("") ) {
-            lockFilterType = "";
+            lockFilterType = "lock";
         }
         return lockFilterType;
     }
@@ -399,7 +399,7 @@
             query.addEqualsFilter("status","1");
 	    } else if ( lockFilterType.equals("unlock") ) {
             query.addEqualsFilter("isLocked","f");
-	    }
+	    } // else show all
     }
 
     private static class RootFolderSelectionModel