Ticket #2545: collapse_empty.2.patch

django/contrib/admin/media/js/admin/CollapsedFieldsets.js

@@ -13 +13 @@
 var CollapsedFieldsets = {
     collapse_re: /\bcollapse\b/,   // Class of fieldsets that should be dealt with.
     collapsed_re: /\bcollapsed\b/, // Class that fieldsets get when they're hidden.
+    collapse_empty_re: /\bcollapse_empty\b/,   // Extra class which only hides fieldsets with no values (still requires "collapse" class)
     collapsed_class: 'collapsed',
     init: function() {
         var fieldsets = document.getElementsByTagName('fieldset');
@@ -21 +22 @@
             // Collapse this fieldset if it has the correct class, and if it
             // doesn't have any errors. (Collapsing shouldn't apply in the case
             // of error messages.)
-            if (fs.className.match(CollapsedFieldsets.collapse_re) && !CollapsedFieldsets.fieldset_has_errors(fs)) {
+            if (fs.className.match(CollapsedFieldsets.collapse_re) 
+              && !CollapsedFieldsets.fieldset_has_errors(fs)
+              && (!fs.className.match(CollapsedFieldsets.collapse_empty_re) || !CollapsedFieldsets.fieldset_not_empty(fs))) {
                 collapsed_seen = true;
                 // Give it an additional class, used by CSS to hide it.
                 fs.className += ' ' + CollapsedFieldsets.collapsed_class;
@@ -53 +56 @@
         }
         return false;
     },
+    fieldset_not_empty: function(fs) {
+        // Returns true if any fields in the fieldset have values.
+        var tags = new Array('select', 'textarea', 'input');
+        var tag;
+        for (var i=0; i<tags.length; i++) {
+            tag = tags[i];
+            var objs = fs.getElementsByTagName(tag);
+            for (var j=0; j<objs.length; j++) {
+                o = objs[j];
+                if (tag=='input' && o.type=='checkbox') {
+                    if (o.checked) {
+                        return true;
+                    }
+                }
+                else if (tag!='input' || o.type!='radio') {
+                    if (o.value) {
+                        return true;
+                    }
+                }
+            }
+        }
+        return false;
+    },
     show: function(fieldset_index) {
         var fs = document.getElementsByTagName('fieldset')[fieldset_index];
         // Remove the class name that causes the "display: none".

docs/model-api.txt

@@ -1171 +1171 @@
     'classes': 'wide extrapretty',
     }
 
-Two useful classes defined by the default admin-site stylesheet are
+Some useful classes defined by the default admin-site stylesheet are
 ``collapse`` and ``wide``. Fieldsets with the ``collapse`` style will be
 initially collapsed in the admin and replaced with a small "click to expand"
-link. Fieldsets with the ``wide`` style will be given extra horizontal space.
+link. Use both ``collapse`` and ``collapse_empty`` to only initially collapse
+the fieldset if all its fields are blank. Fieldsets with the ``wide`` style
+will be given extra horizontal space.
 
 ``description``
 ~~~~~~~~~~~~~~~