Do any of the older summits still have valid ubottu logs? If so, do we want
to break the old links?
On Nov 5, 2013 9:33 PM, "Michael Hall" <email address hidden> wrote:

> Michael Hall has proposed merging
> lp:~mhall119/summit/change-irclog-urls-1226818 into lp:summit.
>
> Commit message:
> Point IRC links and iframes to irclogs.ubuntu.com after the end of a
> summit
>
> Requested reviews:
>   Summit Hackers (summit-hackers)
> Related bugs:
>   Bug #1226818 in Summit: "IRC Logs"
>   https://bugs.launchpad.net/summit/+bug/1226818
>
> For more details, see:
>
> https://code.launchpad.net/~mhall119/summit/change-irclog-urls-1226818/+merge/194050
>
> Point IRC links and iframes to irclogs.ubuntu.com after the end of a
> summit
> --
>
> https://code.launchpad.net/~mhall119/summit/change-irclog-urls-1226818/+merge/194050
> Your team Summit Hackers is requested to review the proposed merge of
> lp:~mhall119/summit/change-irclog-urls-1226818 into lp:summit.
>
> === modified file 'summit/schedule/models/agendamodel.py'
> --- summit/schedule/models/agendamodel.py       2013-02-26 19:31:21 +0000
> +++ summit/schedule/models/agendamodel.py       2013-11-06 02:32:28 +0000
> @@ -48,3 +48,11 @@
>
>      def __unicode__(self):
>          return "%s" % self.meeting
> +
> +    @property
> +    def irc_log(self):
> +        return 'http://irclogs.ubuntu.com/%s/%%23%s.html#t%s' % (
> +            self.slot.start_utc.strftime('%Y/%m/%d'),
> +            self.room.irc_channel,
> +            self.slot.start_utc.strftime('%H:%M'),
> +        )
>
> === modified file 'summit/schedule/models/meetingmodel.py'
> --- summit/schedule/models/meetingmodel.py      2013-11-05 20:56:44 +0000
> +++ summit/schedule/models/meetingmodel.py      2013-11-06 02:32:28 +0000
> @@ -717,6 +717,14 @@
>          return False
>
>      @property
> +    def irc_logs(self):
> +        logs = list()
> +        for agenda in self.agenda_set.all():
> +            logs.append(agenda.irc_log)
> +        return logs
> +
> +
> +    @property
>      def current(self):
>          for agenda in self.agenda_set.all():
>              if agenda.slot.current:
>
> === modified file 'summit/schedule/templates/schedule/meeting.html'
> --- summit/schedule/templates/schedule/meeting.html     2013-05-14
> 02:30:50 +0000
> +++ summit/schedule/templates/schedule/meeting.html     2013-11-06
> 02:32:28 +0000
> @@ -143,7 +143,7 @@
>              {% for ai in agenda_items %}
>                  {% if ai.room.irc_channel %}
>                      {% if summit.state == 'public' %}
> -                    <li><a href="
> http://ubottu.com/uds-logs/archives/{{summit.name}}/%23{{ai.room.irc_channel}}.log">IRC
> Logs for #{{ai.room.irc_channel}}</a></li>
> +                    <li><a href="{{ai.irc_log}}">IRC Logs for
> #{{ai.room.irc_channel}}</a></li>
>                      {% else %}
>                      <li><a href="{{ai.room.webchat_url}}">IRC Channel:
> #{{ai.room.irc_channel}}</a></li>
>                      {% endif %}
>
> === modified file 'summit/schedule/templates/schedule/virtual_meeting.html'
> --- summit/schedule/templates/schedule/virtual_meeting.html     2013-11-05
> 20:56:44 +0000
> +++ summit/schedule/templates/schedule/virtual_meeting.html     2013-11-06
> 02:32:28 +0000
> @@ -126,7 +126,9 @@
>          </div>
>          <div id="chat">
>          {% if summit.state == 'public' %}
> -        <iframe style="width:100%; border:2px solid #000000" src="
> http://ubottu.com/uds-logs/archives/{{ summit.name }}/%23{% for ai in
> agenda_items %}{{ ai.room.irc_channel }}{% endfor %}.log"
> height="395"></iframe>
> +        {% for irc_log in meeting.irc_logs %}
> +        <iframe style="width:100%; border:2px solid #000000"
> src="{{irc_log}}" height="395"></iframe>
> +        {% endfor %}
>          {% else %}
>          {% for ai in agenda_items %}
>          <iframe style="width:100%; border:2px solid #000000" src="{{
> ai.room.webchat_url}}" height="395"></iframe>
>
> === modified file 'summit/schedule/tests/meeting_model.py'
> --- summit/schedule/tests/meeting_model.py      2013-11-05 20:56:44 +0000
> +++ summit/schedule/tests/meeting_model.py      2013-11-06 02:32:28 +0000
> @@ -851,3 +851,29 @@
>          slot.end_utc = now + one_hour
>          slot.save()
>          self.assertTrue(self.meeting.current)
> +
> +    def test_irc_log_urls(self):
> +        now = datetime.datetime.utcnow()
> +        one_hour = datetime.timedelta(0, 3600)
> +
> +        slot = factory.make_one(
> +            Slot,
> +            start_utc=now + one_hour,
> +            end_utc=now + one_hour + one_hour,
> +            type='open',
> +        )
> +        room = factory.make_one(
> +            Room,
> +            summit=self.summit,
> +            irc_channel='test-irc',
> +        )
> +        agenda = factory.make_one(Agenda, meeting=self.meeting,
> slot=slot, room=room)
> +
> +        check_url = 'http://irclogs.ubuntu.com/%s/%%23%s.html#t%s' % (
> +            agenda.slot.start_utc.strftime('%Y/%m/%d'),
> +            agenda.room.irc_channel,
> +            agenda.slot.start_utc.strftime('%H:%M'),
> +        )
> +        self.assertEqual(check_url, agenda.irc_log)
> +        self.assertEqual(check_url, self.meeting.irc_logs[0])
> +
>
>
>