MailManager MailManager.py,1.198.2.33,1.198.2.34

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

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

Modified Files:
      Tag: RELENG_2_1
	MailManager.py 
Log Message:
New button now works on the Tickets screen (#1460881)


Index: MailManager.py
===================================================================
RCS file: /cvsroot/mailmanager/MailManager/MailManager.py,v
retrieving revision 1.198.2.33
retrieving revision 1.198.2.34
diff -u -d -r1.198.2.33 -r1.198.2.34
--- MailManager.py	28 Mar 2006 15:22:03 -0000	1.198.2.33
+++ MailManager.py	29 Mar 2006 20:10:22 -0000	1.198.2.34
@@ -1464,16 +1464,19 @@
         view = SESSION.get('view', 'Open')
         svd = SESSION  # may be changed to search dict
         if view == 'All':
-            state = ('Open', 'Hold', 'Closed', 'New', 'Overdue')
+            state = ('Open', 'Hold', 'Closed', 'Overdue')
+        elif view == 'Open':
+            # This was the behaviour in MM2.0 and earlier
+            state = ('Open', 'Overdue')
+        elif view == 'New':
+            state = ('Open', 'Overdue')
+            unread = self.sql_truevar
         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', 'New', 'Overdue'))
-        elif view == 'Open':
-            # This was the behaviour in MM2.0 and earlier
-            state = ('Open', 'New', 'Overdue')
-        else:
+                            ('Open', 'Hold', 'Closed', 'Overdue'))
+        else: # For Closed, Hold and Overdue
             state = view
 
         # Customers can only see tickets sent from one of their e-mail