[Collective-checkins] CMFNewsletter Newsletter.py,1.16,1.17 NewslettersTool.py,1.4,1.5 TODO,1.5,1.6 workflows.py,1.1,1.2

[Nikolay <faf...@us...>]

Update of /cvsroot/collective/CMFNewsletter
In directory sc8-pr-cvs1:/tmp/cvs-serv13150

Modified Files:
	Newsletter.py NewslettersTool.py TODO workflows.py 
Log Message:
    * some fixes for anonymous
    * complete anonymous subscription form



Index: NewslettersTool.py
===================================================================
RCS file: /cvsroot/collective/CMFNewsletter/NewslettersTool.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- NewslettersTool.py	15 Jan 2004 19:49:10 -0000	1.4
+++ NewslettersTool.py	20 Jan 2004 19:32:42 -0000	1.5
@@ -75,6 +75,8 @@
         else:
             ob = getattr(self, id)
         ob.indexObject()
+        if hasattr(aq_base(ob), 'notifyWorkflowCreated'):
+            ob.notifyWorkflowCreated()
         
         if REQUEST is not None:
             return REQUEST.RESPONSE.redirect(

Index: TODO
===================================================================
RCS file: /cvsroot/collective/CMFNewsletter/TODO,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- TODO	20 Jan 2004 18:19:46 -0000	1.5
+++ TODO	20 Jan 2004 19:32:42 -0000	1.6
@@ -7,3 +7,4 @@
 2. example mail template to show all posibility of system
 including images into emails, modification email headers, etc
 
+3. portlet
\ No newline at end of file

Index: workflows.py
===================================================================
RCS file: /cvsroot/collective/CMFNewsletter/workflows.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- workflows.py	7 Jan 2004 22:38:05 -0000	1.1
+++ workflows.py	20 Jan 2004 19:32:42 -0000	1.2
@@ -61,7 +61,6 @@
     sdef.setPermission(p_modify, 0, (r_manager, r_owner))
     sdef.setPermission(p_subscription, 0, (r_manager, r_member, r_owner, r_anon))
 
-
     sdef = wf.states['custom']
     sdef.setProperties(
         title='Manager can define his own permissions',

Index: Newsletter.py
===================================================================
RCS file: /cvsroot/collective/CMFNewsletter/Newsletter.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- Newsletter.py	20 Jan 2004 17:49:52 -0000	1.16
+++ Newsletter.py	20 Jan 2004 19:32:42 -0000	1.17
@@ -169,7 +169,6 @@
             crit = self.getCriterion('Type')
             crit.edit(('Document', 'News Item'))
         except:
-            #traceback.print_exc()
             pass
 
     security.declareProtected(ModifyPortalContent, 'setTitle')
@@ -252,7 +251,7 @@
                     
                     text_format = member.getProperty('newsletter_format', 'plain')
                 else:
-                    text_format = si.text_format
+                    text_format = si.getTextFormat()
                     
                 if text_format == 'html':
                     html.append(si.getEmail())
@@ -324,8 +323,6 @@
                 'url': self.absolute_url(),
                 }
 
-            print subs
-
             for si in subs:
                 # check if user can view this message
                 if si.member_id != 'Anonymous User':