Changeset 1599:21bd6a956601 in peach3-core

Timestamp:

01/19/2012 05:07:30 PM (4 months ago)

Author:

eriks

Branch:

core-split

Parents:

1598:84036a8c30c1 (diff), 1594:65ac081ba73e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge with 65ac081ba73e5b2d3ff2a09f46993ff6063923c4

File:

• src/peach3/admin/cluster.py (modified) (7 diffs)

src/peach3/admin/cluster.py

@@ -4 +4 @@
 """
 from django.contrib import admin
+from django.core.exceptions import ValidationError
 from django import forms
 from django.forms.formsets import DELETION_FIELD_NAME
-from django.forms.models import modelform_factory, ModelForm
+from django.forms.models import BaseInlineFormSet
 from django.utils.translation import ugettext_lazy as _
 
 from peach3.admin.i18n import I18NModelForm
 from peach3.admin.course import CourseEditionListFilter
+from peach3.admin.forms import ImmutableUserModelForm
 from peach3.admin.formsets import BaseInlineFormSetWithParentInstance
 from peach3.admin.news import NewsItemInline
 from peach3.admin.realm import CourseEditionRealmsListFilter
-from peach3.admin.widgets import ImmutableUserWidget
 
 from peach3.models.cluster import * #@UnusedWildImport
@@ -20 +21 @@
 __all__ = ('ClusterAdmin',)
 
-class ClusterMemberInlineForm(ModelForm):
+class ClusterMemberInlineForm(ImmutableUserModelForm):
     def __init__(self, parent_instance, *args, **kwargs):
         from peach3.models.realm import Realm
@@ -26 +27 @@
         super(ClusterMemberInlineForm, self).__init__(*args, **kwargs)
 
-        # Make the user field Immutable for existing objects
-        if self.instance and self.instance.pk:
-            self.fields['user'].widget = ImmutableUserWidget()
+        admin_cluster = parent_instance.admin_cluster
+        realms_queryset = Realm.objects
+        if admin_cluster:
+            # Admin cluster doesn't need realms
+            realms_queryset = realms_queryset.none()
+        else:
+            # Limit the available Realms for a ClusterMember to the Realms of the CourseEdition
+            realms_queryset = realms_queryset.filter(cluster=parent_instance).distinct()
 
-        # Limit the available Realms for a ClusterMember to the Realms of the CourseEdition
-        self.fields['realm'].queryset = Realm.objects.filter(cluster=parent_instance).distinct()
-
-    def clean_user(self):
-        # Make sure the user was not modified by hacking the hidden field
-        if self.instance and self.instance.pk and self.instance.user:
-            return self.instance.user
-
-        return self.cleaned_data['user']
+        realm_field = self.fields['realm']
+        realm_field.queryset = realms_queryset
+        realm_field.required = not admin_cluster
 
 class ClusterMembersInline(admin.TabularInline):
@@ -49 +49 @@
     extra = 0
 
-class ClusterStaffInlineFormSet(BaseInlineFormSetWithParentInstance):
+class ClusterStaffInlineFormSet(BaseInlineFormSet):
     def add_fields(self, form, index):
         super(ClusterStaffInlineFormSet, self).add_fields(form, index)
 
         if index is not None and index<len(self.queryset):
-            # Make the user field Immutable for existing objects
-            form.fields['user'].widget = ImmutableUserWidget()
-
             # Prevent mutation or deletion of ClusterStaff records of managers
             # Need to do this in the formset instead of in the form itself
@@ -66 +63 @@
                     form.fields[fn].required = False
 
-class ClusterStaffInlineForm(ModelForm):
-    def __init__(self, parent_instance, *args, **kwargs):
-        super(ClusterStaffInlineForm, self).__init__(*args, **kwargs)
-
-    def clean_user(self):
-        # Make sure the user was not modified by hacking the hidden field
-        if self.instance and self.instance.pk and self.instance.user:
-            return self.instance.user
-
-        return self.cleaned_data['user']
-
 class ClusterStaffInline(admin.TabularInline):
     model = ClusterStaff
-    form = ClusterStaffInlineForm
     formset = ClusterStaffInlineFormSet
+    form = ImmutableUserModelForm
 
     fields = 'user', 'level', 'role', 'extend_deadline',
@@ -87 +73 @@
     extra = 0
 
+class ClusterAdminModelForm(I18NModelForm):
+    # For admin clusters, raise a ValidationError if realms are defined
+    # For non-admin clusters, raise ValidationError if no realms are defined
+    # TODO: Figure out a way to completely hide the realms field for admin clusters
+
+    def __init__(self, *arg, **kwargs):
+        super(ClusterAdminModelForm, self).__init__(*arg, **kwargs)
+        self.fields['realms'].required = not self.instance.admin_cluster
+
+    def clean_realms(self):
+        realms = self.cleaned_data['realms']
+        if self.instance.admin_cluster and realms:
+            raise ValidationError, _("Admin cluster cannot have realms")
+
+        return realms
+
+    class Meta:
+        model = Cluster
+
 class ClusterAdmin(admin.ModelAdmin):
-    form = modelform_factory(Cluster, I18NModelForm)
+    form = ClusterAdminModelForm
     fieldsets = (
         (None, {
@@ -102 +107 @@
     )
     raw_id_fields = 'courseedition',
+    readonly_fields = 'admin_cluster',
     filter_horizontal = 'realms',
     inlines = ClusterMembersInline, ClusterStaffInline, NewsItemInline,