Merge lp:~daker/loco-team-portal/fix.706742 into lp:loco-team-portal

[Adnane Belmadiaf]

Fixed bug 706742, props svwilliams

[lp:~daker/loco-team-portal/fix.706742]

642. By Adnane Belmadiaf on 2013-04-14

Reverted a stupid ctrl+v

643. By Adnane Belmadiaf on 2013-04-14

Fixed the help text

=== modified file 'loco_directory/meetings/forms.py'
--- loco_directory/meetings/forms.py	2013-02-17 01:44:52 +0000
+++ loco_directory/meetings/forms.py	2013-04-14 23:41:24 +0000
@@ -67,8 +67,9 @@
             'channel',
             'minutes',
             'chair',
+            'logs'
         )
-        exclude = ('teams', 'date_created', 'logs')
+        exclude = ('teams', 'date_created')
 
     def __init__(self, teams=None, *args, **kargs):
         super(TeamMeetingForm, self).__init__(*args, **kargs)
@@ -107,9 +108,12 @@
 
     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(u'%s' % self.cleaned_data['channel'].encode('ascii', 'ignore')),
-                                                                                                'time': start_date.strftime('%H:%M')}
+        if self.instance.logs is None or "http://irclogs.ubuntu.com" in self.instance.logs:
+            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(u'%s' % self.cleaned_data['channel'].encode('ascii', 'ignore')),
+                'time': start_date.strftime('%H:%M')
+            }
         return super(TeamMeetingForm, self).save()
 
 

=== modified file 'loco_directory/meetings/models.py'
--- loco_directory/meetings/models.py	2012-12-12 23:47:58 +0000
+++ loco_directory/meetings/models.py	2013-04-14 23:41:24 +0000
@@ -17,7 +17,7 @@
     date_begin = models.DateTimeField(help_text=_('Local date and time that the meeting starts'), verbose_name=_('Begins'), db_index=True)
     date_end = models.DateTimeField(help_text=_('Local date and time that the meeting ends'), verbose_name=_('Ends'), db_index=True)
     channel = models.CharField(max_length=150, verbose_name=_('Meeting Channel'), help_text=_('Channel that the meeting will be held in. Ex. #ubuntu-us-fl'), null=True)
-    logs = models.URLField(verbose_name=_('Meeting Log'), help_text=_('After the meeting, add a link to the meeting log'), max_length=200, verify_exists=False, blank=True, null=True)
+    logs = models.URLField(verbose_name=_('Meeting Log'), help_text=_('After the meeting, add a link to the meeting log (leave blank to use the built-in irclog.ubuntu.com'), max_length=200, verify_exists=False, blank=True, null=True)
     minutes = models.URLField(verbose_name=_('Meeting Minutes'), help_text=_('After the meeting, add a link to the meeting minutes'), max_length=200, verify_exists=False, blank=True, null=True)
     date_created = models.DateTimeField(help_text=_('the date and time when the event was created'), default=datetime.datetime.now(), db_index=True)
     chair = models.ForeignKey(UserProfile, verbose_name=_('Meeting Chair'), blank=True, null=True)