Changeset 1440

Show
Ignore:
Timestamp:
03/29/11 23:17:27 (14 months ago)
Author:
winfried
Message:

Splitting the window of entering a chatgroup into two different variables: before and after. closes #281

Location:
HelpIM3/branches/chatgroups
Files:
2 modified

Legend:

Unmodified
Added
Removed

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

    r1401 r1440  
    216216        group = site.getChatgroupById(site, member.group_id) 
    217217        now = datetime.now() 
    218         window = site.siteConfig.chatGroupStartWindow 
     218        windowBefore = site.siteConfig.chatGroupStartWindowBefore 
     219        windowAfter = site.siteConfig.chatGroupStartWindowAfter 
    219220        for meeting in group.meetings: 
    220221            if today(meeting.conv_start_time): 
    … …  
    223224                        # member already joined meeting 
    224225                        return meeting 
    225                 if now < meeting.conv_start_time - timedelta(minutes=int(window)): 
     226                if now < meeting.conv_start_time - timedelta(minutes=int(windowBefore)): 
    226227                    raise TooEarlyException() 
    227                 elif now > meeting.conv_start_time + timedelta(minutes=int(window)): 
     228                elif now > meeting.conv_start_time + timedelta(minutes=int(windowAfter)): 
    228229                    raise TooLateException() 
    229230                else: 

  • HelpIM3/branches/chatgroups/config/sites/chatgroups.xml

    r1413 r1440  
    2929        mailFromName='helpim' 
    3030        mailFromEmail='helpim@localhost' 
    31         chatGroupStartWindow='10' 
     31        chatGroupStartWindowBefore='10' 
     32        chatGroupStartWindowAfter='30' 
    3233        emoticons=":-\) ;-\) :-\( :-P :-O :-S :-D \(t\) \(y\) \(i\) \(p\) \(l\) \(z\) \(c\) \(n\) \(e\)" 
    3334        >