Mercurial > p > roundup > code

diff roundup/cgi_client.py @ 429:fbfca7448422

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Links in page header are now consistent with default sort order. Fixed bugs: - When login failed the list of issues were still rendered. - User was redirected to index page and not to his destination url if his first login attempt failed.
author Roche Compaan <rochecompaan@users.sourceforge.net>
date Fri, 30 Nov 2001 20:47:58 +0000
parents 7956563d49ae
children 350685601f37
line wrap: on
line diff
--- a/roundup/cgi_client.py	Fri Nov 30 20:28:10 2001 +0000
+++ b/roundup/cgi_client.py	Fri Nov 30 20:47:58 2001 +0000
@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-# $Id: cgi_client.py,v 1.71 2001-11-30 20:28:10 rochecompaan Exp $
+# $Id: cgi_client.py,v 1.72 2001-11-30 20:47:58 rochecompaan Exp $
 
 __doc__ = """
 WWW request handler (also used in the stand-alone server).
@@ -111,7 +111,7 @@
         if self.user not in (None, 'anonymous'):
             userid = self.db.user.lookup(self.user)
             user_info = _('''
-<a href="issue?assignedto=%(userid)s&status=-1,unread,deferred,chatting,need-eg,in-progress,testing,done-cbb&:filter=status,assignedto&:sort=activity&:columns=id,activity,status,title,assignedto&:group=priority&show_customization=1">My Issues</a> |
+<a href="issue?assignedto=%(userid)s&status=-1,unread,deferred,chatting,need-eg,in-progress,testing,done-cbb&:filter=status,assignedto&:sort=-activity&:columns=id,activity,status,title,assignedto&:group=priority&show_customization=1">My Issues</a> |
 <a href="user%(userid)s">My Details</a> | <a href="logout">Logout</a>
 ''')%locals()
         else:
@@ -135,9 +135,9 @@
 <td align=right valign=bottom>%(user_name)s</td></tr>
 <tr class="location-bar">
 <td align=left>All
-<a href="issue?status=-1,unread,deferred,chatting,need-eg,in-progress,testing,done-cbb&:sort=activity&:filter=status&:columns=id,activity,status,title,assignedto&:group=priority&show_customization=1">Issues</a>
+<a href="issue?status=-1,unread,deferred,chatting,need-eg,in-progress,testing,done-cbb&:sort=-activity&:filter=status&:columns=id,activity,status,title,assignedto&:group=priority&show_customization=1">Issues</a>
 | Unassigned
-<a href="issue?assignedto=-1&status=-1,unread,deferred,chatting,need-eg,in-progress,testing,done-cbb&:sort=activity&:filter=status,assignedto&:columns=id,activity,status,title,assignedto&:group=priority&show_customization=1">Issues</a>
+<a href="issue?assignedto=-1&status=-1,unread,deferred,chatting,need-eg,in-progress,testing,done-cbb&:sort=-activity&:filter=status,assignedto&:columns=id,activity,status,title,assignedto&:group=priority&show_customization=1">Issues</a>
 %(add_links)s
 %(admin_links)s</td>
 <td align=right>%(user_info)s</td>
@@ -634,7 +634,7 @@
         if self.user is None and self.ANONYMOUS_REGISTER == 'deny':
             self.write('</table>')
             self.pagefoot()
-            return
+            return 1
         values = {'realname': '', 'organisation': '', 'address': '',
             'phone': '', 'username': '', 'password': '', 'confirm': ''}
         if newuser_form is not None:
@@ -680,13 +680,16 @@
         except KeyError:
             name = self.user
             self.make_user_anonymous()
-            return self.login(message=_('No such user "%(name)s"')%locals())
+            action = self.form['__destination_url'].value
+            return self.login(message=_('No such user "%(name)s"')%locals(),
+                              action=action)
 
         # and that the password is correct
         pw = self.db.user.get(uid, 'password')
         if password != self.db.user.get(uid, 'password'):
             self.make_user_anonymous()
-            return self.login(message=_('Incorrect password'))
+            action = self.form['__destination_url'].value
+            return self.login(message=_('Incorrect password'), action=action)
 
         self.set_cookie(self.user, password)
         return None     # make it explicit
@@ -914,8 +917,8 @@
         if self.user not in (None, 'anonymous'):
             userid = self.db.user.lookup(self.user)
             user_info = _('''
-<a href="issue?assignedto=%(userid)s&status=-1,unread,deferred,chatting,need-eg,in-progress,testing,done-cbb&:filter=status,assignedto&:sort=activity&:columns=id,activity,status,title,assignedto&:group=priority&show_customization=1">My Issues</a> |
-<a href="support?assignedto=%(userid)s&status=-1,unread,deferred,chatting,need-eg,in-progress,testing,done-cbb&:filter=status,assignedto&:sort=activity&:columns=id,activity,status,title,assignedto&:group=customername&show_customization=1">My Support</a> |
+<a href="issue?assignedto=%(userid)s&status=-1,unread,deferred,chatting,need-eg,in-progress,testing,done-cbb&:filter=status,assignedto&:sort=-activity&:columns=id,activity,status,title,assignedto&:group=priority&show_customization=1">My Issues</a> |
+<a href="support?assignedto=%(userid)s&status=-1,unread,deferred,chatting,need-eg,in-progress,testing,done-cbb&:filter=status,assignedto&:sort=-activity&:columns=id,activity,status,title,assignedto&:group=customername&show_customization=1">My Support</a> |
 <a href="user%(userid)s">My Details</a> | <a href="logout">Logout</a>
 ''')%locals()
         else:
@@ -943,8 +946,8 @@
 <a href="issue?status=-1,unread,deferred,chatting,need-eg,in-progress,testing,done-cbb&:sort=activity&:filter=status&:columns=id,activity,status,title,assignedto&:group=priority&show_customization=1">Issues</a>,
 <a href="support?status=-1,unread,deferred,chatting,need-eg,in-progress,testing,done-cbb&:sort=activity&:filter=status&:columns=id,activity,status,title,assignedto&:group=customername&show_customization=1">Support</a>
 | Unassigned
-<a href="issue?assignedto=-1&status=-1,unread,deferred,chatting,need-eg,in-progress,testing,done-cbb&:sort=activity&:filter=status,assignedto&:columns=id,activity,status,title,assignedto&:group=priority&show_customization=1">Issues</a>,
-<a href="support?assignedto=-1&status=-1,unread,deferred,chatting,need-eg,in-progress,testing,done-cbb&:sort=activity&:filter=status,assignedto&:columns=id,activity,status,title,assignedto&:group=customername&show_customization=1">Support</a>
+<a href="issue?assignedto=-1&status=-1,unread,deferred,chatting,need-eg,in-progress,testing,done-cbb&:sort=-activity&:filter=status,assignedto&:columns=id,activity,status,title,assignedto&:group=priority&show_customization=1">Issues</a>,
+<a href="support?assignedto=-1&status=-1,unread,deferred,chatting,need-eg,in-progress,testing,done-cbb&:sort=-activity&:filter=status,assignedto&:columns=id,activity,status,title,assignedto&:group=customername&show_customization=1">Support</a>
 %(add_links)s
 %(admin_links)s</td>
 <td align=right>%(user_info)s</td>
@@ -1024,6 +1027,10 @@
 
 #
 # $Log: not supported by cvs2svn $
+# Revision 1.71  2001/11/30 20:28:10  rochecompaan
+# Property changes are now completely traceable, whether changes are
+# made through the web or by email
+#
 # Revision 1.70  2001/11/30 00:06:29  richard
 # Converted roundup/cgi_client.py to use _()
 # Added the status file, I18N_PROGRESS.txt
Roundup Issue Tracker: http://roundup-tracker.org/