Verified Commit f6553a8f authored by Sli's avatar Sli Committed by Sli

Group management enhacement

parent a6f76f52
{% extends "core/base.jinja" %}
{% block title %}
{% trans %}Group detail{% endtrans %}
{% endblock title %}
{% block content %}
<p><a href="{{ url('core:group_list') }}">{% trans %}Back to list{% endtrans %}</a></p>
{% if not object.users.exists() %}
<p>{% trans %}No user in this group{% endtrans %}</p>
{% else %}
<ul>
{% for user in object.users.all() %}
<li><a href="{{ url('core:user_profile', user.id) }}">{{ user }}</a></li>
{% endfor %}
</ul>
{% endif %}
{% endblock content %}
\ No newline at end of file
......@@ -7,11 +7,21 @@
{% block content %}
<h3>{% trans %}Group list{% endtrans %}</h3>
<p><a href="{{ url('core:group_new') }}">{% trans %}New group{% endtrans %}</a></p>
<ul>
{% for g in realgroup_list %}
<li><a href="{{ url('core:group_edit', group_id=g.id) }}">{{ g.name }}</a> - {{ g.description }} -
<a href="{{ url('core:group_delete', group_id=g.id) }}">{% trans %}Delete{% endtrans %}</a></li>
{% endfor %}
</ul>
<table>
<tr>
<th>{% trans %}ID{% endtrans %}</th>
<th>{% trans %}Group{% endtrans %}</th>
<th>{% trans %}Description{% endtrans %}</th>
</tr>
{% for group in object_list %}
<tr>
<td>{{ group.id }}</td>
<td><a href="{{ url('core:group_detail', group.id) }}">{{ group }}</a></td>
<td>{{ group.description }}</td>
<td><a href="{{ url('core:group_edit', group.id) }}">{% trans %}Edit{% endtrans %}</a></td>
<td><a href="{{ url('core:group_delete', group.id) }}">{% trans %}Delete{% endtrans %}</a></td>
</tr>
{% endfor %}
</table>
{% endblock %}
......@@ -64,6 +64,11 @@ urlpatterns = [
GroupDeleteView.as_view(),
name="group_delete",
),
url(
r"^group/(?P<group_id>[0-9]+)/detail$",
GroupDetailView.as_view(),
name="group_detail",
),
# User views
url(r"^user/$", UserListView.as_view(), name="user_list"),
url(
......
......@@ -23,7 +23,7 @@
#
from django.views.generic.edit import UpdateView, CreateView, DeleteView
from django.views.generic import ListView
from django.views.generic import ListView, DetailView
from django.core.urlresolvers import reverse_lazy
from core.models import RealGroup
......@@ -36,6 +36,7 @@ class GroupListView(CanEditMixin, ListView):
"""
model = RealGroup
ordering = ["name"]
template_name = "core/group_list.jinja"
......@@ -52,6 +53,12 @@ class GroupCreateView(CanEditMixin, CreateView):
fields = ["name", "description"]
class GroupDetailView(CanEditMixin, DetailView):
model = RealGroup
pk_url_kwarg = "group_id"
template_name = "core/group_detail.jinja"
class GroupDeleteView(CanEditMixin, DeleteView):
model = RealGroup
pk_url_kwarg = "group_id"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment