From: <ke...@us...> - 2006-04-18 15:27:43
|
Revision: 2922 Author: kevca Date: 2006-04-18 08:27:33 -0700 (Tue, 18 Apr 2006) ViewCVS: http://svn.sourceforge.net/mailmanager/?rev=2922&view=rev Log Message: ----------- Fixed - Return to Queue does not return to queues list (#1464947) Modified Paths: -------------- MailManager/branches/RELENG_2_1/CHANGES.txt MailManager/branches/RELENG_2_1/Extensions/TicketPluggableBrain.py Modified: MailManager/branches/RELENG_2_1/CHANGES.txt =================================================================== --- MailManager/branches/RELENG_2_1/CHANGES.txt 2006-04-18 14:23:23 UTC (rev 2921) +++ MailManager/branches/RELENG_2_1/CHANGES.txt 2006-04-18 15:27:33 UTC (rev 2922) @@ -3,6 +3,7 @@ - Setting template should return to template (#1464961) - Close button not listed (#1464954) - Restrict incoming emails with cc's to other accts to 1 tckt (#1464959) +- Return to Queue does not return to queues list (#1464947) * BUG FIXES From 2.0.7 to 2.0.8 - Non existant refresh value leads to security error (#1466274) - Cannot create HTML tickets (#1466223) Modified: MailManager/branches/RELENG_2_1/Extensions/TicketPluggableBrain.py =================================================================== --- MailManager/branches/RELENG_2_1/Extensions/TicketPluggableBrain.py 2006-04-18 14:23:23 UTC (rev 2921) +++ MailManager/branches/RELENG_2_1/Extensions/TicketPluggableBrain.py 2006-04-18 15:27:33 UTC (rev 2922) @@ -814,15 +814,16 @@ msg) - security.declareProtected('MailManager Manage Tickets', 'returnToQueue') - def returnToQueue(self, mail_to, cc='', bcc='', subject='', body='', - body_is_html=0, user_signature=None, sendmail=0, - last_modified=None, REQUEST=None, RESPONSE=None): - """Add a copy of a message to a ticket. + security.declareProtected('MailManager Manage Tickets', 'http_returnToQueue') + def http_returnToQueue(self, mail_to, cc='', bcc='', subject='', + body='', body_is_html=0, user_signature=None, + sendmail=0, next_id=None, last_modified=None, + offset=None, REQUEST=None, RESPONSE=None): + """ Returns the current ticket to the queue - FIXME: RULESETMODS - This needs replaced higher up so that it ties in with the ruleset - engine instead. + This method returns the current ticket to the queue. It then + redirects to the next ticket, or to the tickets list should + no next ticket exist. """ # First, check for any modifications to the ticket if last_modified: @@ -845,9 +846,13 @@ print "No transition made" transitions = False + # Redirect to next ticket or to the tickets list if RESPONSE is not None: - return RESPONSE.redirect('%s/ticket/%06d' % (self.getBaseURL(), - self.id)) + if next_id is not None and offset is not None: + RESPONSE.redirect('%s/ticket/%06d?offset:int=%d' % ( + self.getBaseURL(), next_id, offset)) + else: + RESPONSE.redirect('%s/Tickets' % self.getBaseURL()) def getDefaultTemplate(self, REQUEST): This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |