Ticket #10964: group_admin.patch

django/contrib/admin/templates/admin/auth/group_form.html

@@ +1 @@
+{% extends "admin/change_form.html" %}
+
+{% block extrahead %}
+        {{ block.super }} 
+        {{ form.media }}
+{% endblock %}
+
+{% load i18n %}
+
+{% block after_field_sets %}
+<fieldset class="module aligned">
+
+        <div class="form-row">
+          {{ form.name.errors }}
+          <label for="id_name" class="required">{% trans 'Name' %}:</label> {{ form.name }}
+          <p class="help">{{ form.name.help_text }}</p>
+        </div>
+
+        <div class="form-row">
+          {{ form.permissions.errors }}
+          <label for="id_permissions">{% trans 'Permissions' %}:</label> {{ form.permissions }}
+          <p class="help">{{ form.permissions.help_text }}</p>
+        </div>
+
+        <div class="form-row">
+          {{ form.users.errors }}
+          <label for="id_users">{% trans 'Users' %}:</label> {{ form.users }}
+          <p class="help">{{ form.users.help_text }}</p>
+        </div>
+
+        <script type="text/javascript">document.getElementById("id_name").focus();</script>
+</fieldset>
+{% endblock %}

django/contrib/auth/admin.py

@@ -1 +1 @@
 from django import template
 from django.conf import settings
 from django.contrib import admin
-from django.contrib.auth.forms import UserCreationForm, UserChangeForm, AdminPasswordChangeForm
+from django.contrib.auth.forms import UserCreationForm, UserChangeForm, AdminPasswordChangeForm, GroupForm
 from django.contrib.auth.models import User, Group
 from django.core.exceptions import PermissionDenied
 from django.http import HttpResponseRedirect, Http404
@@ -11 +11 @@
 from django.utils.translation import ugettext, ugettext_lazy as _
 
 class GroupAdmin(admin.ModelAdmin):
-    search_fields = ('name',)
-    ordering = ('name',)
-    filter_horizontal = ('permissions',)
+        search_fields = ('name',)
+        ordering = ('name',)
+        filter_horizontal=('permissions',)
 
+        def add_view(self, request, form_url='', extra_context=None):
+                if request.method == 'POST':
+                        form = GroupForm(request.POST)
+                        if form.is_valid():
+                                form.save()
+                else:
+                        form = GroupForm()
+                dictionary = {'title': _(u'Add group'), 'form': form,
+                                          'is_popup': '_popup' in request.REQUEST, 'add': True, 
+                                          'change': False, 'has_add_permission': True,
+                                          'has_delete_permission': False, 
+                                          'has_change_permission': True, 'has_file_field': False,
+                                          'has_absolute_url': False, 'auto_populated_fields': (),
+                                          'opts': self.model._meta, 'save_as': False,
+                                          'root_path': self.admin_site.root_path,
+                                          'app_label': self.model._meta.app_label}
+                return render_to_response('admin/auth/group_form.html', dictionary)
+                
+        def change_view(self, request, object_id, extra_context=None):
+                if request.method == 'POST':
+                        form = GroupForm(request.POST, 
+                                                         instance=Group.objects.get(id=object_id))
+                        if form.is_valid():
+                                form.save()
+                else:
+                        form = GroupForm(instance=Group.objects.get(id=object_id))
+                dictionary = {'title': _(u'Edit group'), 'form': form,
+                                          'is_popup': '_popup' in request.REQUEST, 'add': True, 
+                                          'change': False, 'has_add_permission': True,
+                                          'has_delete_permission': False, 
+                                          'has_change_permission': True, 'has_file_field': False,
+                                          'has_absolute_url': False, 'auto_populated_fields': (),
+                                          'opts': self.model._meta, 'save_as': False,
+                                          'root_path': self.admin_site.root_path,
+                                          'app_label': self.model._meta.app_label}
+                return render_to_response('admin/auth/group_form.html', dictionary)
+
 class UserAdmin(admin.ModelAdmin):
     fieldsets = (
         (None, {'fields': ('username', 'password')}),

django/contrib/auth/forms.py

@@ -1 @@
-from django.contrib.auth.models import User
+from django.contrib.auth.models import User, Group
 from django.contrib.auth import authenticate
 from django.contrib.auth.tokens import default_token_generator
 from django.contrib.sites.models import Site
 from django.template import Context, loader
 from django import forms
+from django.contrib.admin.widgets import FilteredSelectMultiple
 from django.utils.translation import ugettext_lazy as _
 from django.utils.http import int_to_base36
 
@@ -205 +206 @@
         if commit:
             self.user.save()
         return self.user
+
+class GroupForm(forms.ModelForm):
+
+        def __init__(self, *args, **kwargs):
+                forms.ModelForm.__init__(self, *args, **kwargs)
+                initial = {}
+                users = User.objects.all().order_by('last_name')
+                if 'instance' in kwargs:
+                        for user in users:
+                                if user in kwargs['instance'].user_set.all():
+                                        initial[str(user.id)] = ''
+                dictionary = {'queryset': users,
+                                          'widget': FilteredSelectMultiple('Users', False),
+                                          'initial': initial, 'required': False}
+                self.fields['users'] = forms.ModelMultipleChoiceField(**dictionary)
+                                                                         
+        def save(self, commit=True):
+                group = forms.ModelForm.save(self, commit)
+                for user in group.user_set.all():
+                        if not user in self.cleaned_data['users']:
+                                user.groups.remove(group)
+                                user.save()
+                for user in self.cleaned_data['users']:
+                        user.groups.add(group)
+                        user.save()
+                return group
+        
+        class Meta:
+                model = Group