MailManager MailManager.py,1.226,1.227

[Andrew V. <av...@us...>]

Update of /cvsroot/mailmanager/MailManager
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14057

Modified Files:
	MailManager.py 
Log Message:
listTickets now behaves in the same was as it did on previous versions of MM


Index: MailManager.py
===================================================================
RCS file: /cvsroot/mailmanager/MailManager/MailManager.py,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -d -r1.226 -r1.227
--- MailManager.py	28 Feb 2006 12:38:20 -0000	1.226
+++ MailManager.py	3 Mar 2006 16:56:19 -0000	1.227
@@ -1449,23 +1449,18 @@
         is_overdue = False
         view = SESSION.get('view', 'Open')
         svd = SESSION  # may be changed to search dict
-        if view == 'New':
-            unread = self.sql_truevar
-            state = ('Open', 'Hold', 'Closed')
-        elif view in ('Open', 'Hold', 'Closed', 'Spam', 'Queued'):
-            state = view
-        elif view == 'All':
-            state = ('Open', 'Hold', 'Closed')
-        elif view == 'Overdue':
-            state = 'Open'
-            is_overdue = self.sql_truevar
+        if view == 'All':
+            state = ('Open', 'Hold', 'Closed', 'New', 'Overdue')
         elif view == 'Search':
             # This makes the default search results show all non-spam tickets.
             svd = SESSION.get('search', {})
-            state = svd.get('state', ('Open', 'Hold', 'Closed'))
-            if state == 'Overdue':
-                state = 'Open'
-                is_overdue = self.sql_truevar
+            state = svd.get('state',
+                            ('Open', 'Hold', 'Closed', 'New', 'Overdue'))
+        elif view == 'Open':
+            # This was the behaviour in MM2.0 and earlier
+            state = ('Open', 'New', 'Overdue')
+        else:
+            state = view
 
         # Customers can only see tickets sent from one of their e-mail
         # addresses; others by default see tickets from all addresses.