[CMF-checkins] CVS: CMF/CMFCollector - Collector.py:1.32 CollectorIssue.py:1.43

[Tres Seaver]

Update of /cvs-repository/CMF/CMFCollector
In directory cvs.zope.org:/tmp/cvs-serv11734

Modified Files:
	Collector.py CollectorIssue.py 
Log Message:
 - Undo brain-dead accidental commit.

=== CMF/CMFCollector/Collector.py 1.31 => 1.32 ===
 
     security.declareProtected(AddCollectorIssue, 'add_issue')
-    def add_issue(self, id=None, title=None, description=None):
+    def add_issue(self,
+                  title=None,
+                  description=None,
+                  security_related=None,
+                  submitter_name=None,
+                  submitter_email=None,
+                  kibitzers=None,
+                  topic=None,
+                  importance=None,
+                  classification=None,
+                  version_info=None,
+                  assignees=None,
+                  file=None, fileid=None, filetype=None):
         """Create a new collector issue."""
-        if id is None:
-            id = self.new_issue_id()
-
-        self._setObject( id, CollectorIssue( id
-                                           , title=title
-                                           , description=description
-                                           ) )
-        issue = getattr( self, id )
-        return id, issue
+        id = self.new_issue_id()
+        submitter_id = str(getSecurityManager().getUser())
+        
+        err = addCollectorIssue(self,
+                                id,
+                                title=title,
+                                description=description,
+                                submitter_id=submitter_id,
+                                submitter_name=submitter_name,
+                                submitter_email=submitter_email,
+                                kibitzers=kibitzers,
+                                topic=topic,
+                                classification=classification,
+                                security_related=security_related,
+                                importance=importance,
+                                version_info=version_info,
+                                assignees=assignees,
+                                file=file, fileid=fileid, filetype=filetype)
+        return id, err
 
 
     security.declareProtected(ManageCollector, 'edit')
-<<<<<<< Collector.py
-    def edit(self,
-             title=None,
-             description=None,
-             abbrev=None,
-             email=None,
-             managers=None,
-             supporters=None,
-             dispatching=None,
-=======
     def edit(self, title=None, description=None,
              abbrev=None, email=None,
              managers=None, supporters=None, dispatching=None,
              participation=None,
->>>>>>> 1.26
              state_email=None,
-             topics=None,
-             classifications=None,
+             topics=None, classifications=None,
              importances=None,
              version_info_spiel=None):
 


=== CMF/CMFCollector/CollectorIssue.py 1.42 => 1.43 === (1318/1418 lines abridged)
         """Update the explicitly passed fields."""
 
-<<<<<<< CollectorIssue.py
-<<<<<<< CollectorIssue.py
-    ACTIONS_ORDER = [ 'Accept'
-                    , 'Assign'
-                    , 'Resolve'
-                    , 'Reject'
-                    , 'Defer'
-                    , 'Resign'
-                    ] 
-
-    _action_number = 0
-
-    _submitter_id = _submitter_email = _submitter_name = None
-    _supporters = ()
-    _kibitzers = ()
-    _security_related = 0
-    _topic = _classification = _importance = _resolution = None
-    _version_info = ''
-    _invisible = 0
-
-    def __init__( self
-                , id
-                , title=''
-                , description=''
-                ):
-
-        SkinnedFolder.__init__( self
-                              , id
-                              , title
-                              )
-
-        DefaultDublinCoreImpl.__init__( self
-                                      , title=title
-                                      , description=description
-                                      )
-
-        self._create_transcript( title, description )
-
-    #
-    #   Property management.
-    #
-    security.declareProtected( CMFCorePermissions.View, 'isSecurityRelated' )
-    def isSecurityRelated( self ):
-        """
-            Is this issue related to security (and therefore, should it
-            receive special handling)?
-        """
-        return self._security_related

[-=- -=- -=- 1318 lines omitted -=- -=- -=-]

-                     ):
-=======
                       submitter_id=None,
                       submitter_name=None,
                       submitter_email=None,
@@ -1994,16 +751,9 @@
                       security_related=0,
                       importance=None,
                       version_info=None,
-<<<<<<< CollectorIssue.py
-                      invisible=0,
-                      REQUEST=None
-                     ):
->>>>>>> 1.38.2.1
-=======
                       assignees=None,
                       file=None, fileid=None, filetype=None,
                       REQUEST=None):
->>>>>>> 1.39
     """Create a new issue in the collector.
 
     We return a string indicating any errors, or None if there weren't any."""
@@ -2011,9 +761,6 @@
     it = CollectorIssue(id=id,
                         container=self,
                         title=title,
-<<<<<<< CollectorIssue.py
-                        description=description)
-=======
                         description=description,
                         submitter_id=submitter_id,
                         submitter_name=submitter_name,
@@ -2024,15 +771,10 @@
                         security_related=security_related,
                         importance=importance,
                         version_info=version_info,
-<<<<<<< CollectorIssue.py
-                        invisible=invisible
-                       )
->>>>>>> 1.38.2.1
-=======
                         assignees=assignees,
                         file=file, fileid=fileid, filetype=filetype)
->>>>>>> 1.39
     it = self._getOb(it.id)
-    got = it.do_action('request', description, file, fileid, filetype)
+    got = it.do_action('request', description, assignees,
+                       file, fileid, filetype)
 
     return got