Changeset 1353

Timestamp:

12/21/10 16:45:07 (17 months ago)

Author:

zeank

Message:

allow to set mark for users that already received an invitation

closes #267

Location:

HelpIM3/branches/chatgroups/HelpIM/chatgroup

Files:

• db/databaseMetadata.py (modified) (1 diff)
• db/services.py (modified) (1 diff)
• pages/ShowGroup.py (modified) (5 diffs)

HelpIM3/branches/chatgroups/HelpIM/chatgroup/db/databaseMetadata.py

@@ -78 +78 @@
                nullable=False
                ),
+        Column('invite_sent',
+               Boolean,
+               nullable=False,
+               default=False),
         Column('is_admin',
                Boolean,

HelpIM3/branches/chatgroups/HelpIM/chatgroup/db/services.py

@@ -127 +127 @@
             session.flush()
             
+    def toggleChatGroupInviteSent(self, site, member_id):
+        session = site.database.getSession()
+        member = self.getChatGroupMemberById(site, member_id)
+        if not member is None:
+            member.invite_sent = not member.invite_sent
+            session.flush()
+
     def toggleChatGroupAdmin(self, site, member_id):
         session = site.database.getSession()

HelpIM3/branches/chatgroups/HelpIM/chatgroup/pages/ShowGroup.py

@@ -53 +53 @@
              {'table_column': [
                  {'type': 'action',
+                  'heading': 'invite sent'},
+                 [{'action':
+                   [{'name': self.function,
+                     'textAttr': 'invited',
+                     'title': 'click to toggle attribute'},
+                    [{'actionParm': [{'name': 'group_id=%s&action=toggleInviteSent&member_id' % self.getParam('group_id'),
+                                      'valueAttr': 'id'}]}],
+                     ]
+                   }]
+                 ]},
+             {'table_column': [
+                 {'type': 'action',
                   'heading': 'facilitator'},
                  [{'action':
@@ -200 +212 @@
                 else:
                     member.facilitator = 'nee'
+                if member.invite_sent:
+                    member.invited = 'ja'
+                else:
+                    member.invited = 'nee'
                 members.append(member)
 
@@ -206 +222 @@
                 'MembersRecord',
                 members,
-                ['id', 'email', 'nickname', 'facilitator', 'is_admin', 'chat_link_token', 'chat_link'],
+                ['id', 'email', 'nickname', 'facilitator', 'invited', 'chat_link_token', 'chat_link'],
                 fieldsAsAttributes
                 )
@@ -258 +274 @@
                                   self.getParam('group_id'),
                                   nickname))
-        elif self.checkParam('action', 'deleteMember') or self.checkParam('action', 'toggleMemberIsAdmin') :
+        elif self.checkParam('action', 'deleteMember') or self.checkParam('action', 'toggleFacilitator') or self.checkParam('action', 'toggleInviteSent'):
             """ well, that's bullshit because we don't have any
             fields. but on the other side it prevents performAction
@@ -294 +310 @@
         elif self.checkParam('action', 'deleteMember'):
             self.site.deleteChatGroupMember(self.site, self.getParam('member_id'))
+        elif self.checkParam('action', 'toggleInviteSent'):
+            self.site.toggleChatGroupInviteSent(self.site, self.getParam('member_id'))
         elif self.checkParam('action', 'toggleFacilitator'):
             self.site.toggleChatGroupAdmin(self.site, self.getParam('member_id'))