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

[Adnane Belmadiaf]

Fixed the irc nickname when it contains a dot

[Chris Johnston (cjohnston)]

Environment:

Request Method: GET
Request URL: http://127.0.0.1:8000/teams/ubuntu-us-florida
Django Version: 1.2.5
Python Version: 2.7.1
Installed Applications:
['django.contrib.auth',
 'django.contrib.contenttypes',
 'django.contrib.sessions',
 'django.contrib.admin',
 'common',
 'teams',
 'venues',
 'events',
 'meetings',
 'userprofiles',
 'django_openid_auth',
 'south',
 'bzr_apps']
Installed Middleware:
('django.middleware.common.CommonMiddleware',
 'django.middleware.locale.LocaleMiddleware',
 'django.contrib.sessions.middleware.SessionMiddleware',
 'django.contrib.auth.middleware.AuthenticationMiddleware')

Template error:
In template /home/chris/Dropbox/Projects/loco-directory/reviews/loco_directory/templates/teams/team_detail.html, error at line 2
   'teams_tags' is not a valid tag library: Template library teams_tags not found, tried django.templatetags.teams_tags,django.contrib.admin.templatetags.teams_tags,meetings.templatetags.teams_tags
   1 : {% extends "base.html" %}

   2 : {% load i18n teams_tags %}

   3 :

   4 : {% block title %}{% trans team.name %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %}

   5 :

   6 : {% block sub_nav_links %}

   7 : <a class="sub-nav-item" href="{% url team-list %}" title="{% trans "Back to Teams List" %}">{% trans "Back to Teams List" %}</a>

   8 : {% if is_member %}{% else %} <a class="sub-nav-item" href="https://launchpad.net/~{{ team.lp_name }}/+join">{% trans "Join This Team!" %}</a>{% endif %}

   9 : {% if is_admin %}<a class="sub-nav-item" href="{% url team-edit team.lp_name %}" title="{% trans "Edit Details" %}">{% trans "Edit Details" %}</a>{% endif %}

   10 : {% if is_admin and not team.active %}<a class="sub-nav-item" href="{% url select-other-team team.lp_name %}" title="{% trans "Merge with another team" %}">{% trans "Merge team" %}</a>{% endif %}

   11 : {% if is_member %}<a class="sub-nav-item" href="{% url team-event-new team.lp_name %}" title="{% trans "Add New Event" %}">{% trans "Add New Event" %}</a>{% endif %}

   12 : {% if is_member %}<a class="sub-nav-item" href="{% url team-meeting-new team.lp_name %}" title="{% trans "Add New Meeting" %}">{% trans "Add New Meeting" %}</a>{% endif %}

Traceback:
File "/usr/lib/pymodules/python2.7/django/core/handlers/base.py" in get_response
  100. response = callback(request, *callback_args, **callback_kwargs)
File "/home/chris/Dropbox/Projects/loco-directory/reviews/loco_directory/teams/views.py" in team_detail
  170. context, RequestContext(request))
File "/usr/lib/pymodules/python2.7/django/shortcuts/__init__.py" in render_to_response
  20. return HttpResponse(loader.render_to_string(*args, **kwargs), **httpresponse_kwargs)
File "/usr/lib/pymodules/python2.7/django/template/loader.py" in render_to_string
  181. t = get_template(template_name)
File "/usr/lib/pymodules/python2.7/django/template/loader.py" in get_template
  160. template = get_template_from_string(template, origin, template_name)
File "/usr/lib/pymodules/python2.7/django/template/loader.py" in get_template_fro...

review: Needs Fixing

[Chris Johnston (cjohnston)]

It also looks like the IRC Chat page in the header was not updated as well.

review: Needs Fixing

[Adnane Belmadiaf (daker)]

Oh yeah the /irc i'll update it.

[Chris Johnston (cjohnston)]

It worked for me this time on the team details page.. Just needs fixing on the IRC page and it will be ready to go.

review: Needs Fixing

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

438. By Adnane Belmadiaf on 2011-07-16

* Fixed the IRC page

[Chris Johnston (cjohnston)]

Thanks

review: Approve

=== added directory 'loco_directory/common/templatetags'
=== added file 'loco_directory/common/templatetags/__init__.py'
=== added file 'loco_directory/common/templatetags/teams_tags.py'
--- loco_directory/common/templatetags/teams_tags.py	1970-01-01 00:00:00 +0000
+++ loco_directory/common/templatetags/teams_tags.py	2011-07-16 10:56:34 +0000
@@ -0,0 +1,12 @@
+# -*- coding: utf-8 -*-
+from django import template
+
+register = template.Library()
+
+def irc(nickname):
+    """ 
+        Replace dots with underscores
+    """
+    return nickname.replace('.', '_')
+
+register.filter('irc', irc)

=== modified file 'loco_directory/templates/irc_chat.html'
--- loco_directory/templates/irc_chat.html	2011-02-03 01:43:39 +0000
+++ loco_directory/templates/irc_chat.html	2011-07-16 10:56:34 +0000
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n teams_tags %}
 
 {% block title %} {% trans "Ubuntu LoCo Teams IRC Chat" %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %}
 
@@ -17,7 +17,7 @@
     <br />
     <div id="ircchat">
         {% if user.is_authenticated %}
-            <iframe src="http://webchat.freenode.net/?channels=#ubuntu-locoteams&prompt=1&uio=MTE9MzE28&nick={{ user.username }}" width="900" height="400"></iframe>
+            <iframe src="http://webchat.freenode.net/?channels=#ubuntu-locoteams&prompt=1&uio=MTE9MzE28&nick={{ user.username|irc }}" width="900" height="400"></iframe>
         {% else %}
             <iframe src="http://webchat.freenode.net/?channels=#ubuntu-locoteams&prompt=1&uio=MTE9MzE28&nick=locodir-user" width="900" height="400"></iframe>
         {% endif %}

=== modified file 'loco_directory/templates/teams/team_detail.html'
--- loco_directory/templates/teams/team_detail.html	2011-06-13 11:17:32 +0000
+++ loco_directory/templates/teams/team_detail.html	2011-07-16 10:56:34 +0000
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n teams_tags %}
 
 {% block title %}{% trans team.name %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %}
 
@@ -215,7 +215,7 @@
 {% if team.irc_chan %}
     <div id="webchat">
         {% if user.is_authenticated %}
-            <iframe src="http://webchat.freenode.net/?channels={{ team.irc_chan }}&prompt=1&uio=OT10cnVlJjEwPXRydWUmMTE9MjM218&nick={{ user.username }}" width="900" height="400"></iframe>
+            <iframe src="http://webchat.freenode.net/?channels={{ team.irc_chan }}&prompt=1&uio=OT10cnVlJjEwPXRydWUmMTE9MjM218&nick={{ user.username|irc }}" width="900" height="400"></iframe>
         {% else %}
             <iframe src="http://webchat.freenode.net/?channels={{ team.irc_chan }}&prompt=1&uio=OT10cnVlJjEwPXRydWUmMTE9MjM218&nick=locodir-user" width="900" height="400"></iframe>
         {% endif %}