Merge lp:~ronnie.vd.c/loco-team-portal/686267 into lp:loco-team-portal

[Ronnie]

Added the link to the details page when meeting is past

=== modified file 'loco_directory/meetings/forms.py'
--- loco_directory/meetings/forms.py	2011-01-05 13:38:47 +0000
+++ loco_directory/meetings/forms.py	2011-01-05 15:52:25 +0000
@@ -9,6 +9,7 @@
 from userprofiles.models import UserProfile
 
 import pytz
+import urllib
 
 
 class BaseMeetingForm(forms.ModelForm, RenderableMixin):
@@ -54,7 +55,7 @@
     """
     class Meta(BaseMeetingForm.Meta):
         model = TeamMeeting
-        exclude = ('teams', 'date_created')
+        exclude = ('teams', 'date_created', 'logs')
         
     def __init__(self, team=None, *args, **kargs):
         super(TeamMeetingForm, self).__init__(*args, **kargs)
@@ -74,4 +75,12 @@
         return [('', '---------'),
                 (_('Team members'), team_members),
                 (_('Other users'), other_members)]
+                
+    def save(self):
+        start_date = self.cleaned_data['date_begin']
+        self.instance.logs = 'http://irclogs.ubuntu.com/%(date)s/%(channel)s.html#t%(time)s' % {'date': start_date.strftime('%Y/%m/%d'),
+                                                                                                'channel': urllib.quote(self.cleaned_data['channel']),
+                                                                                                'time': start_date.strftime('%H:%M')}
+        return super(TeamMeetingForm, self).save()
+        
         

=== modified file 'loco_directory/meetings/models.py'
--- loco_directory/meetings/models.py	2010-12-24 13:04:51 +0000
+++ loco_directory/meetings/models.py	2011-01-05 15:52:25 +0000
@@ -38,7 +38,7 @@
 ''' % {'id':self.id, 'dtstart':dtstart, 'dtend':dtend, 'meetingname':self.name}
 
     def is_past(self):
-        return self.date_end > datetime.datetime.today()
+        return self.date_end < datetime.datetime.today()
 
 class TeamMeetingManager(models.Manager):
     """ manager for a team event """

=== modified file 'loco_directory/templates/meetings/team_meeting_detail_basic.inc.html'
--- loco_directory/templates/meetings/team_meeting_detail_basic.inc.html	2010-12-25 19:17:12 +0000
+++ loco_directory/templates/meetings/team_meeting_detail_basic.inc.html	2011-01-05 15:52:25 +0000
@@ -39,12 +39,12 @@
             <td class="form-item-value"><a href="{{ team_meeting_object.minutes }}">{{ team_meeting_object.minutes }}</a></td>
         </tr>
     {% endif %}
-    {% if team_meeting_object.logs %}
+    {% if team_meeting_object.logs %}{% if team_meeting_object.is_past %}
         <tr>
             <th class="form-item-label" scope="row"><label>{% trans "Meeting Logs:" %}</label></th>
             <td class="form-item-value"><a href="{{ team_meeting_object.logs }}">{{ team_meeting_object.logs }}</a></td>
         </tr>
-    {% endif %}
+    {% endif %}{% endif %}
 {% endif %}
 </table>
 {% endif %}