mailmanager MailManager.py,1.141,1.142 Ticket.py,1.82,1.83

[Graeme M. <ma...@us...>]

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

Modified Files:
	MailManager.py Ticket.py 
Log Message:
Fix addAtachment() not to require a standard attachment to exist.


Index: Ticket.py
===================================================================
RCS file: /cvsroot/mailmanager/mailmanager/Ticket.py,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -d -r1.82 -r1.83
--- Ticket.py	14 Jan 2005 12:34:01 -0000	1.82
+++ Ticket.py	28 Jan 2005 14:45:08 -0000	1.83
@@ -470,7 +470,7 @@
     # Used in Response Form
 
     security.declareProtected('MailManager Manage Tickets', 'addAttachment')
-    def addAttachment(self, standard_attach, REQUEST, file_attach=None):
+    def addAttachment(self, REQUEST, standard_attach=None, file_attach=None):
         """Add an attachment to a reply.
 
         The attachment can either be one of the standard attachments or an
@@ -479,7 +479,7 @@
         """
         attachments = REQUEST.SESSION.get('attachments', {})
         if len(attachments) > 5:
-            REQUEST.set('error', 'No more than 6 attachments are allowed.')
+            REQUEST.set('error', 'No more than 5 attachments are allowed.')
             return self.index_html(self, REQUEST)
         if standard_attach:
             file = self.attachments[standard_attach]
@@ -492,7 +492,7 @@
                         file_attach.headers.get('content-type',
                                                 'application/octet-stream'),
                     'data': file_attach.read()}
-            if len(file['data']) > 10485760: # 10MB
+            if len(file['data']) > 10 * 1024 * 1024: # 10MB
                 REQUEST.set('error', 'Attachment is larger than 10MB')
             else:
                 attachments[file_attach.filename] = file

Index: MailManager.py
===================================================================
RCS file: /cvsroot/mailmanager/mailmanager/MailManager.py,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -d -r1.141 -r1.142
--- MailManager.py	25 Jan 2005 09:02:48 -0000	1.141
+++ MailManager.py	28 Jan 2005 14:45:07 -0000	1.142
@@ -521,7 +521,7 @@
     # Ticket Methods
 
     security.declareProtected('MailManager Create Tickets', 'addAttachment')
-    def addAttachment(self, standard_attach, REQUEST, file_attach=None):
+    def addAttachment(self, REQUEST, standard_attach = None, file_attach=None):
         """Add an attachment to a reply.
 
         The attachment can either be one of the standard attachments or an