mailmanager MailManager.py,1.147.2.17,1.147.2.18

[Andrew V. <av...@us...>]

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

Modified Files:
      Tag: db-backend
	MailManager.py 
Log Message:
More work on groups.


Index: MailManager.py
===================================================================
RCS file: /cvsroot/mailmanager/mailmanager/MailManager.py,v
retrieving revision 1.147.2.17
retrieving revision 1.147.2.18
diff -u -d -r1.147.2.17 -r1.147.2.18
--- MailManager.py	28 Mar 2005 08:33:09 -0000	1.147.2.17
+++ MailManager.py	28 Mar 2005 15:07:01 -0000	1.147.2.18
@@ -967,7 +967,7 @@
     # Group Settings
 
     security.declareProtected('MailManager Settings', 'addOrEditGroup')
-    def addOrEditGroup(self, group_name, section, REQUEST, agent=None):
+    def addOrEditGroup(self, group_name, section, REQUEST, agents=None):
          """Creates a new group or edits an existing one."""
          error = None
          if section == 'add' and self.groups.has_key(group_name):
@@ -976,7 +976,7 @@
          if not group_name:
              error = 'You must enter a group name.'
              flag = 'group_name'
-         if agent is None:
+         if agents is None:
              error = 'You must select at least one user.'
              flag = 'users'
          if error is not None:
@@ -984,8 +984,11 @@
              REQUEST.set('flag_%s' % flag, 1)
          else:
              REQUEST.set('section', 'list')
-             self.groups[group_name] = Group(agent)
-             self._p_changed = 1
+             id = self.sql.getNextGroupId()[0].id
+             self.sql.addGroup(id=id, group_name=group_name)
+             self.sql.createGroupSeq(group_id=id, group_size=len(agents)-1)
+             for agent in agents:
+                 self.sql.addGroupMember(group_id=id, username=agent)
          return self.GroupSettings(self, REQUEST)
 
     security.declareProtected('MailManager Settings', 'delGroup')