Fix some more URLs.

setup.py

@@ -5,7 +5,7 @@ os.chdir(os.path.normpath(os.path.join(os.path.abspath(__file__), os.pardir)))
 
 setup(
     name='ticdesk',
-    version='0.12.1',
+    version='0.12.2',
     packages=find_packages(),
     include_package_data=True,
     author='Teckids e.V.',

ticdesk_account/templates/ticdesk_account/register.html

@@ -57,7 +57,7 @@
     {% blocktrans %}Du hast dich erfolgreich für einen Teckids-Account registriert.{% endblocktrans %}
    </p>
    <p>
-    <a href="{% url 'ticdesk_account:login' %}?{{ request.GET.urlencode }}">
+    <a href="{% url 'account:login' %}?{{ request.GET.urlencode }}">
      {% blocktrans %}
       Weiter zum Login
      {% endblocktrans %}

ticdesk_org/templates/ticdesk_org/base.html

@@ -15,7 +15,7 @@
       <ul>
        {% for item in type.list %}
         <li>
-         <a href="{% url 'persons_by_group' item.cn %}">
+         <a href="{% url 'org:persons_by_group' item.cn %}">
           {{ item.display_name }}
          </a>
         </li>

ticdesk_org/templates/ticdesk_org/person.html

@@ -79,7 +79,7 @@
        <li>{{ type.grouper.1 }}
         <ul>
          {% for group in type.list %}
-          <li><a href="{% url 'persons_by_group' group.cn %}">{{ group.display_name }}</a></li>
+          <li><a href="{% url 'org:persons_by_group' group.cn %}">{{ group.display_name }}</a></li>
          {% endfor %}
         </ul>
        </li>
@@ -98,7 +98,7 @@
        <li>{{ type.grouper.1 }}
         <ul>
          {% for group in type.list %}
-          <li><a href="{% url 'persons_by_group' group.cn %}">{{ group.display_name }}</a></li>
+          <li><a href="{% url 'org:persons_by_group' group.cn %}">{{ group.display_name }}</a></li>
          {% endfor %}
         </ul>
        </li>

ticdesk_org/templates/ticdesk_org/persons.html

@@ -9,19 +9,19 @@
   <p>
    {% blocktrans %}Leiter{% endblocktrans %}:
    {% for owner in group.owners_persons %}
-    <a href="{% url 'person_by_uid' owner.uid %}">{{ owner.cn }}</a>
+    <a href="{% url 'org:person_by_uid' owner.uid %}">{{ owner.cn }}</a>
     {% if not forloop.last %} &middot; {% endif %}
    {% endfor %}
   </p>
 
   <p>
    {% blocktrans %}Weitere Formate{% endblocktrans %}:
-   <a href="{% url 'map' %}?group_cn={{ group.cn }}">{% blocktrans %}Karte{% endblocktrans %}</a>
+   <a href="{% url 'org:map' %}?group_cn={{ group.cn }}">{% blocktrans %}Karte{% endblocktrans %}</a>
    &middot;
    PDF (
-   <a href="{% url 'persons_by_group' group.cn %}?format=pdf&amp;template=list_participants">{% blocktrans %}Teilnehmerliste{% endblocktrans %}</a>
+   <a href="{% url 'org:persons_by_group' group.cn %}?format=pdf&amp;template=list_participants">{% blocktrans %}Teilnehmerliste{% endblocktrans %}</a>
    &middot;
-   <a href="{% url 'persons_by_group' group.cn %}?format=pdf&amp;template=list_attendance">{% blocktrans %}Anwesenheitsliste{% endblocktrans %}</a>
+   <a href="{% url 'org:persons_by_group' group.cn %}?format=pdf&amp;template=list_attendance">{% blocktrans %}Anwesenheitsliste{% endblocktrans %}</a>
    )
   </p>
 

ticdesk_org/urls.py

@@ -4,7 +4,7 @@ from . import views
 
 urlpatterns = [
     url(r'^persons$', views.persons, name='persons'),
-    url(r'^persons/(?P<group>[a-z][a-z0-9-]+)$', views.persons, name='persons_by_group'),
+    url(r'^persons/(?P<group>[a-z][a-z0-9-]+)$', views.persons, name='org:persons_by_group'),
     url(r'^person$', views.person, name='person'),
     url(r'^person/(?P<uid>[a-z][a-z0-9]+)$', views.person, name='person_by_uid'),
     url(r'^map$', views.map, name='map'),

ticdesk_org/views.py

@@ -20,7 +20,7 @@ def person(request, uid=None):
 
     # Redirect to own listing if no uid given
     if uid is None:
-        return redirect(reverse('person_by_uid', args=[request.user.username]))
+        return redirect(reverse('org:person_by_uid', args=[request.user.username]))
 
     # Get person and check access    
     person = TeckidsPerson.objects.get(uid=uid)
@@ -130,7 +130,7 @@ def map(request):
     context['title'] = group.display_name
 
     # Generate GeoJSON endpoint
-    context['geojson'] = '%s?%s' % (reverse('persons_by_group', args=[group_cn]), 'format=geojson')
+    context['geojson'] = '%s?%s' % (reverse('org:persons_by_group', args=[group_cn]), 'format=geojson')
 
     # Add information for menu
     context['relevant_groups'] = get_relevant_groups(request.user)