settings options to disable group managment

This commit is contained in:
Élie Bouttier 2014-08-31 15:19:58 -07:00
parent a5329a2a8f
commit fbb51da7c5
3 changed files with 25 additions and 0 deletions

View file

@ -5,6 +5,7 @@ from django.views.decorators.http import require_http_methods
from django.contrib import messages from django.contrib import messages
from django.db.models import Q from django.db.models import Q
from django.core.exceptions import ObjectDoesNotExist from django.core.exceptions import ObjectDoesNotExist
from django.conf import settings
from django.http import Http404, HttpResponse, JsonResponse from django.http import Http404, HttpResponse, JsonResponse
@ -41,6 +42,7 @@ def user_details(request, user):
'user': get_object_or_404(User, id=user), 'user': get_object_or_404(User, id=user),
'directteams': Team.objects.filter(users__id=user), 'directteams': Team.objects.filter(users__id=user),
'tab': tab, 'tab': tab,
'group_managment': settings.GROUP_MANAGMENT,
}) })
@ -114,6 +116,8 @@ def user_delete(request, user):
@project_perm_required('manage_accounts') @project_perm_required('manage_accounts')
def user_add_group(request, user): def user_add_group(request, user):
if not settings.GROUP_MANAGMENT:
raise Http404()
user = get_object_or_404(User, id=user) user = get_object_or_404(User, id=user)
if request.method == 'POST': if request.method == 'POST':
group = request.POST.get('group') group = request.POST.get('group')
@ -152,6 +156,8 @@ def user_add_group(request, user):
@project_perm_required('manage_accounts') @project_perm_required('manage_accounts')
def user_remove_group(request, user, group): def user_remove_group(request, user, group):
if not settings.GROUP_MANAGMENT:
raise Http404()
user = get_object_or_404(User, pk=user) user = get_object_or_404(User, pk=user)
group = get_object_or_404(Group, pk=group) group = get_object_or_404(Group, pk=group)
user.groups.remove(group) user.groups.remove(group)
@ -227,11 +233,14 @@ def group_list(request):
def group_details(request, group): def group_details(request, group):
return render(request, 'accounts/group_details.html', { return render(request, 'accounts/group_details.html', {
'group': get_object_or_404(Group, id=group), 'group': get_object_or_404(Group, id=group),
'group_managment': settings.GROUP_MANAGMENT,
}) })
@project_perm_required('manage_accounts') @project_perm_required('manage_accounts')
def group_edit(request, group=None): def group_edit(request, group=None):
if not settings.GROUP_MANAGMENT:
raise Http404()
if group: if group:
group = get_object_or_404(Group, id=group) group = get_object_or_404(Group, id=group)
@ -254,6 +263,8 @@ def group_edit(request, group=None):
@require_http_methods(["POST"]) @require_http_methods(["POST"])
@project_perm_required('manage_accounts') @project_perm_required('manage_accounts')
def group_delete(request, group): def group_delete(request, group):
if not settings.GROUP_MANAGMENT:
raise Http404()
group = get_object_or_404(Group, id=group) group = get_object_or_404(Group, id=group)
group.delete() group.delete()
messages.success(request, 'Group deleted successfully.') messages.success(request, 'Group deleted successfully.')
@ -262,6 +273,8 @@ def group_delete(request, group):
@project_perm_required('manage_accounts') @project_perm_required('manage_accounts')
def group_add_user(request, group): def group_add_user(request, group):
if not settings.GROUP_MANAGMENT:
raise Http404()
group = get_object_or_404(Group, id=group) group = get_object_or_404(Group, id=group)
if request.method == 'POST': if request.method == 'POST':
user = request.POST.get('user') user = request.POST.get('user')
@ -300,6 +313,8 @@ def group_add_user(request, group):
@project_perm_required('manage_accounts') @project_perm_required('manage_accounts')
def group_remove_user(request, group, user): def group_remove_user(request, group, user):
if not settings.GROUP_MANAGMENT:
raise Http404()
group = get_object_or_404(Group, id=group) group = get_object_or_404(Group, id=group)
user = get_object_or_404(User, id=user) user = get_object_or_404(User, id=user)
user.groups.remove(group) user.groups.remove(group)

View file

@ -22,15 +22,18 @@
Group {{ group }} Group {{ group }}
   
<small><span id="users-counter">{{ group.users.count }}</span> users</small> <small><span id="users-counter">{{ group.users.count }}</span> users</small>
{% if group_managment %}
<div class="pull-right"> <div class="pull-right">
<a href="{% url 'edit-group' group.id %}" class="btn btn-primary"><span class="glyphicon glyphicon-edit"></span> edit</a> <a href="{% url 'edit-group' group.id %}" class="btn btn-primary"><span class="glyphicon glyphicon-edit"></span> edit</a>
<a href="javascript:void(0);" data-item="group" data-action="{% url 'delete-group' group.id %}" data-toggle="modal" data-target="#confirm-delete" class="btn btn-danger"><span class="glyphicon glyphicon-trash"></span> delete</a> <a href="javascript:void(0);" data-item="group" data-action="{% url 'delete-group' group.id %}" data-toggle="modal" data-target="#confirm-delete" class="btn btn-danger"><span class="glyphicon glyphicon-trash"></span> delete</a>
</div> </div>
{% endif %}
</h1> </h1>
</div> </div>
<ul class="nav nav-tabs" role="tablist"> <ul class="nav nav-tabs" role="tablist">
<li class="active"><a href="#" role="tab">Members</a></li> <li class="active"><a href="#" role="tab">Members</a></li>
{% if group_managment %}
<form class="form-inline pull-right" method="post" action="{% url 'add-user-to-group' group.id %}" role="form" id="add-user-form"> <form class="form-inline pull-right" method="post" action="{% url 'add-user-to-group' group.id %}" role="form" id="add-user-form">
{% csrf_token %} {% csrf_token %}
<div class="form-group"> <div class="form-group">
@ -42,6 +45,7 @@
</div> </div>
</div> </div>
</form> </form>
{% endif %}
</ul> </ul>
<br /> <br />
@ -57,7 +61,9 @@
{% if user.fullname %} {% if user.fullname %}
<span class="text-muted">— {{ user.fullname }}</span> <span class="text-muted">— {{ user.fullname }}</span>
{% endif %} {% endif %}
{% if group_managment %}
<a href="javascript:void(0);" data-href="{% url 'remove-user-from-group' group.id user.id %}" data-type="users" class="pull-right btn btn-danger btn-xs" role="remove">remove</a> <a href="javascript:void(0);" data-href="{% url 'remove-user-from-group' group.id user.id %}" data-type="users" class="pull-right btn btn-danger btn-xs" role="remove">remove</a>
{% endif %}
</li> </li>
{% endfor %} {% endfor %}
</ul> </ul>

View file

@ -42,6 +42,7 @@
<ul class="nav nav-tabs" role="tablist"> <ul class="nav nav-tabs" role="tablist">
<li{% if tab == 'group' %} class="active"{% endif %}><a href="#group-pane" role="tab" data-toggle="tab" data-showtab="group" data-hidetab="team">Groups</a></li> <li{% if tab == 'group' %} class="active"{% endif %}><a href="#group-pane" role="tab" data-toggle="tab" data-showtab="group" data-hidetab="team">Groups</a></li>
<li{% if tab == 'team' %} class="active"{% endif %}><a href="#team-pane" role="tab" data-toggle="tab" data-showtab="team" data-hidetab="group">Teams</a></li> <li{% if tab == 'team' %} class="active"{% endif %}><a href="#team-pane" role="tab" data-toggle="tab" data-showtab="team" data-hidetab="group">Teams</a></li>
{% if group_managment %}
<form class="form-inline pull-right{% if tab == 'team' %} hidden{% endif %}" method="post" action="{% url 'add-group-to-user' user.id %}" role="form" id="add-group-form"> <form class="form-inline pull-right{% if tab == 'team' %} hidden{% endif %}" method="post" action="{% url 'add-group-to-user' user.id %}" role="form" id="add-group-form">
{% csrf_token %} {% csrf_token %}
<div class="form-group"> <div class="form-group">
@ -53,6 +54,7 @@
</div> </div>
</div> </div>
</form> </form>
{% endif %}
<form class="form-inline pull-right{% if tab == 'group' %} hidden{% endif %}" method="post" action="{% url 'add-team-to-user' user.id %}" role="form" id="add-team-form"> <form class="form-inline pull-right{% if tab == 'group' %} hidden{% endif %}" method="post" action="{% url 'add-team-to-user' user.id %}" role="form" id="add-team-form">
{% csrf_token %} {% csrf_token %}
<div class="form-group"> <div class="form-group">
@ -77,7 +79,9 @@
{% for group in user.groups.all %} {% for group in user.groups.all %}
<li class="list-group-item"> <li class="list-group-item">
{{ group }} {{ group }}
{% if group_managment %}
<a href="javascript:void(0);" data-href="{% url 'remove-group-from-user' user.id group.id %}" data-type="groups" class="pull-right btn btn-danger btn-xs" role="remove">remove</a> <a href="javascript:void(0);" data-href="{% url 'remove-group-from-user' user.id group.id %}" data-type="groups" class="pull-right btn btn-danger btn-xs" role="remove">remove</a>
{% endif %}
</li> </li>
{% endfor %} {% endfor %}
</ul> </ul>