From c13f4ba52d03dcf2fe73174d440fb0e0bdcc7792 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Norman=20J=C3=A4ckel?= <my-git-mail@normanjaeckel.de>
Date: Tue, 30 Oct 2012 00:07:25 +0100
Subject: [PATCH] Add UserView and GroupView part 2

---
 openslides/participant/models.py              | 10 +++-
 .../participant/base_participant.html         | 47 +++++++++++++++++++
 .../templates/participant/group_detail.html   | 15 +++++-
 .../templates/participant/group_overview.html |  3 +-
 .../templates/participant/group_widget.html   |  2 +-
 .../templates/participant/overview.html       |  2 +-
 .../templates/participant/user_detail.html    | 35 +++++++++++++-
 .../templates/participant/user_widget.html    |  2 +-
 openslides/participant/urls.py                |  4 +-
 openslides/participant/views.py               | 12 +++--
 10 files changed, 117 insertions(+), 15 deletions(-)

diff --git a/openslides/participant/models.py b/openslides/participant/models.py
index cabb54b7a..2490b89d7 100644
--- a/openslides/participant/models.py
+++ b/openslides/participant/models.py
@@ -78,14 +78,17 @@ class User(DjangoUser, PersonMixin, Person):
         self.save()
 
     @models.permalink
-    def get_absolute_url(self, link='edit'):
+    def get_absolute_url(self, link='view'):
         """
         Return the URL to this user.
 
         link can be:
+        * view
         * edit
         * delete
         """
+        if link == 'view':
+            return ('user_view', [str(self.id)])
         if link == 'edit':
             return ('user_edit', [str(self.id)])
         if link == 'delete':
@@ -114,14 +117,17 @@ class Group(DjangoGroup, PersonMixin, Person):
     description = models.TextField(blank=True)
 
     @models.permalink
-    def get_absolute_url(self, link='edit'):
+    def get_absolute_url(self, link='view'):
         """
         Return the URL to this user.
 
         link can be:
+        * view
         * edit
         * delete
         """
+        if link == 'view':
+            return ('user_group_view', [str(self.id)])
         if link == 'edit':
             return ('user_group_edit', [str(self.id)])
         if link == 'delete':
diff --git a/openslides/participant/templates/participant/base_participant.html b/openslides/participant/templates/participant/base_participant.html
index bb726731d..d9fc3adeb 100644
--- a/openslides/participant/templates/participant/base_participant.html
+++ b/openslides/participant/templates/participant/base_participant.html
@@ -27,4 +27,51 @@
         <li><a href="{% url print_passwords %}"><img src="{% static 'images/icons/pdf.png' %}"> {% trans 'First time passwords as PDF' %}</a></li>
         {% endif %}
     </ul>
+
+    {# second submenu #}
+    {% if shown_user %}
+        <br>
+        <h3>{{ shown_user.clean_name }}</h3>
+        <ul>
+            {# view shown_user #}
+            <li class="{% if request.path == 'foo' %}selected{% endif %}">
+                <a href="{% model_url shown_user 'view' %}">{% trans 'View participant' %}</a>
+            </li>
+
+            {% if perms.participant.can_manage_participant %}
+
+                {# edit shown_user #}
+                <li class="{% if request.path ==  'foo' %}selected{% endif %}">
+                    <a href="{% model_url shown_user 'edit' %}"><img src="{% static 'images/icons/edit.png' %}"> {% trans 'Edit participant' %}</a>
+                </li>
+
+                {# delete shown_user #}
+                <li>
+                    <a href="{% model_url shown_user 'delete'  %}"><img src="{% static 'images/icons/delete.png' %}"> {% trans 'Delete participant' %}</a>
+                </li>
+            {% endif %}
+        </ul>
+    {% elif group %}
+        <br>
+        <h3>{{ group.name }}</h3>
+        <ul>
+            {# view group #}
+            <li class="{% if request.path == 'foo' %}selected{% endif %}">
+                <a href="{% model_url group 'view' %}">{% trans 'View group' %}</a>
+            </li>
+
+            {# edit group #}
+            <li class="{% if request.path ==  'foo' %}selected{% endif %}">
+                <a href="{% model_url group 'edit' %}"><img src="{% static 'images/icons/edit.png' %}"> {% trans 'Edit group' %}</a>
+            </li>
+
+            {# delete group #}
+            {% if group.name != 'Anonymous' %}
+                <li>
+                    <a href="{% model_url group 'delete'  %}"><img src="{% static 'images/icons/delete.png' %}"> {% trans 'Delete group' %}</a>
+                </li>
+            {% endif %}
+        </ul>
+    {% endif %}
+
 {% endblock %}
diff --git a/openslides/participant/templates/participant/group_detail.html b/openslides/participant/templates/participant/group_detail.html
index 770380218..3a7f748f4 100644
--- a/openslides/participant/templates/participant/group_detail.html
+++ b/openslides/participant/templates/participant/group_detail.html
@@ -1,9 +1,20 @@
 {% extends "participant/base_participant.html" %}
 
-{% block title %}{{ block.super }} – {{ object }}{% endblock %}
+{% load i18n %}
+{% load tags %}
+
+{% block title %}{{ block.super }} – {{ group }}{% endblock %}
 
 {% block content %}
 
-{{ object }}
+<h1>{{ group }}</h1>
+
+<p>{{ group.description }}</p>
+
+<h2>{% trans "Members" %}</h2>
+
+{% for member in group.user_set.all %}
+    <p>{{ member }}</p>
+{% endfor %}
 
 {% endblock %}
diff --git a/openslides/participant/templates/participant/group_overview.html b/openslides/participant/templates/participant/group_overview.html
index 3745308fb..c226f7ec1 100644
--- a/openslides/participant/templates/participant/group_overview.html
+++ b/openslides/participant/templates/participant/group_overview.html
@@ -2,6 +2,7 @@
 
 {% load i18n %}
 {% load staticfiles %}
+{% load tags %}
 
 {% block title %}{{ block.super }} – {% trans "User groups" %}{% endblock %}
 
@@ -14,7 +15,7 @@
         </tr>
     {% for group in groups %}
         <tr class="{% cycle '' 'odd' %}">
-            <td>{{ group.name }}</td>
+            <td><a href="{% model_url group 'view' %}">{{ group.name }}</a></td>
             <td><a href="{% url user_group_edit group.id %}"><img src="{% static 'images/icons/edit.png' %}" title="{% trans 'Edit group' %}"></a>
             {% if group.name != 'Anonymous' %}
             <a href="{% url user_group_delete group.id %}"><img src="{% static 'images/icons/delete.png' %}" title="{% trans 'Delete group' %}"></a>
diff --git a/openslides/participant/templates/participant/group_widget.html b/openslides/participant/templates/participant/group_widget.html
index 5900ef547..50cd7e6b6 100644
--- a/openslides/participant/templates/participant/group_widget.html
+++ b/openslides/participant/templates/participant/group_widget.html
@@ -17,7 +17,7 @@
         <a href="{% url projctor_preview_slide group.sid %}" title="{% trans 'Preview' %}" class="icon preview right">
             <span></span>
         </a>
-        <a href="{% model_url group 'edit' %}">{{ group }}</a>
+        <a href="{% model_url group 'view' %}">{{ group }}</a>
     </li>
     {% endif %}
 {% empty %}
diff --git a/openslides/participant/templates/participant/overview.html b/openslides/participant/templates/participant/overview.html
index f950bc302..0066b1dbe 100644
--- a/openslides/participant/templates/participant/overview.html
+++ b/openslides/participant/templates/participant/overview.html
@@ -76,7 +76,7 @@
         </tr>
         {% for user in users %}
             <tr class="{% cycle '' 'odd' %}">
-                <td>{{ user.first_name }}</td>
+                <td><a href="{% model_url user 'view' %}">{{ user.first_name }}</a></td>
                 <td>{{ user.last_name }}</td>
                 <td>{{ user.detail }}</td>
                 <td>{{ user.get_type_display }}</td>
diff --git a/openslides/participant/templates/participant/user_detail.html b/openslides/participant/templates/participant/user_detail.html
index 770380218..379248bc1 100644
--- a/openslides/participant/templates/participant/user_detail.html
+++ b/openslides/participant/templates/participant/user_detail.html
@@ -1,9 +1,40 @@
 {% extends "participant/base_participant.html" %}
 
-{% block title %}{{ block.super }} – {{ object }}{% endblock %}
+{% load i18n %}
+{% load tags %}
+
+{% block title %}{{ block.super }} – {{ shown_user }}{% endblock %}
 
 {% block content %}
 
-{{ object }}
+<h1>{{ shown_user }}</h1>
+
+<p>{{ shown_user.email }}</p>
+
+<h2>{% trans "Groups" %}</h2>
+<p>
+    {% for group in shown_user.groups.all %}
+    {{ group }},
+    {% endfor %}
+</p>
+
+<h2>{% trans "Gender" %}</h2>
+<p>{{ shown_user.get_gender_display }}</p>
+
+<h2>{% trans "Type" %}</h2>
+<p>{{ shown_user.get_type_display }}</p>
+
+<h2>{% trans "Committee" %}</h2>
+<p>{{ shown_user.committee }}</p>
+
+{% if perms.participant.can_manage_participant %}
+    <h2>{% trans "Comment" %}</h2>
+    <p>{{ shown_user.comment }}</p>
+
+    <h2>{% trans "Last Login" %}</h2>
+    {% if shown_user.last_login > shown_user.date_joined %}
+        <p>{{ shown_user.last_login }}</p>
+    {% endif %}
+{% endif %}
 
 {% endblock %}
diff --git a/openslides/participant/templates/participant/user_widget.html b/openslides/participant/templates/participant/user_widget.html
index 21e0db5a9..e8657cb17 100644
--- a/openslides/participant/templates/participant/user_widget.html
+++ b/openslides/participant/templates/participant/user_widget.html
@@ -16,7 +16,7 @@
         <a href="{% url projctor_preview_slide user.sid %}" title="{% trans 'Preview' %}" class="icon preview right">
             <span></span>
         </a>
-        <a href="{% model_url user 'edit' %}">{{ user }}</a>
+        <a href="{% model_url user 'view' %}">{{ user }}</a>
     </li>
 {% empty %}
     <li>{% trans 'No users available.' %}</li>
diff --git a/openslides/participant/urls.py b/openslides/participant/urls.py
index ed98c45c5..e3ac2e553 100644
--- a/openslides/participant/urls.py
+++ b/openslides/participant/urls.py
@@ -34,7 +34,7 @@ urlpatterns = patterns('',
 
     url(r'^(?P<pk>\d+)/$',
         UserDetailView.as_view(),
-        name='user_detail',
+        name='user_view',
     ),
 
     url(r'^(?P<pk>\d+)/edit/$',
@@ -88,7 +88,7 @@ urlpatterns = patterns('',
 
     url(r'^group/(?P<pk>\d+)/$',
         GroupDetailView.as_view(),
-        name='user_group_detail',
+        name='user_group_view',
     ),
 
     url(r'^group/(?P<pk>\d+)/edit/$',
diff --git a/openslides/participant/views.py b/openslides/participant/views.py
index 4fa817128..854b59b31 100644
--- a/openslides/participant/views.py
+++ b/openslides/participant/views.py
@@ -140,19 +140,25 @@ class UserOverview(ListView):
         return context
 
 
-from django.views.generic.detail import DetailView
-class UserDetailView(DetailView):
+from openslides.utils.views import DetailView, PermissionMixin
+class UserDetailView(DetailView, PermissionMixin):
     """
     Classed based view to show a specific user in the interface.
     """
+    permission_required = 'participant.can_see_participant'
     model = User
+    template_name = 'participant/user_detail.html'
+    context_object_name = 'shown_user'
 
 
-class GroupDetailView(DetailView):
+class GroupDetailView(DetailView, PermissionMixin):
     """
     Classed based view to show a specific group in the interface.
     """
+    permission_required = 'participant.can_manage_participant'
     model = Group
+    template_name = 'participant/group_detail.html'
+    context_object_name = 'group'
 
 
 class UserCreateView(CreateView):