Ticket #12509: adminui-selectorinline-2.diff

django/forms/formsets.py

@@ -119 +119 @@
         return self.forms[self.initial_form_count():]
     extra_forms = property(_get_extra_forms)
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     # Maybe this should just go away?
     def _get_cleaned_data(self):
         """
@@ -268 +283 @@
         """A hook for adding extra fields on to each form instance."""
         if self.can_order:
             # Only pre-fill the ordering field for initial forms.
-            if index < self.initial_form_count():
+            if index < self.initial_form_count():
                 form.fields[ORDERING_FIELD_NAME] = IntegerField(label=_(u'Order'), initial=index+1, required=False)
             else:
                 form.fields[ORDERING_FIELD_NAME] = IntegerField(label=_(u'Order'), required=False)

django/forms/models.py

@@ -620 +620 @@
                 pk_value = form.instance.pk
             else:
                 try:
-                    pk_value = self.get_queryset()[index].pk
+                    if index is not None:
+                        pk_value = self.get_queryset()[index].pk
+                    else:
+                        pk_value = None
                 except IndexError:
                     pk_value = None
             if isinstance(pk, OneToOneField) or isinstance(pk, ForeignKey):

django/contrib/admin/media/css/base.css

@@ -260 +260 @@
     padding: 2px 5px;
     font-size: 11px;
     background: #e1e1e1 url(../img/admin/nav-bg.gif) top left repeat-x;
-    border-left: 1px solid #ddd;
     border-bottom: 1px solid #ddd;
 }
 
@@ -328 +327 @@
 
 /* ORDERABLE TABLES */
 
-table.orderable tbody tr td:hover {
-    cursor: move;
+table.orderable tbody trhover {
+    ;
 }
 
-table.orderable tbody tr td:first-child {
-    padding-left: 14px;
+table.orderable tbody tr td: {
+    padding-left: 1px;
     background-image: url(../img/admin/nav-bg-grabber.gif);
     background-repeat: repeat-y;
 }
 
+
+
+
+
 table.orderable-initalized .order-cell, body>tr>td.order-cell {
     display: none;
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 /* FORM DEFAULTS */
 
 input, textarea, select, .form-row p {

django/contrib/admin/media/css/forms.css

@@ -233 +233 @@
     width: 8em;
 }
 
-.inline-related {
-    position: relative;
-}
-
 .inline-related h3 {
     margin: 0;
     color: #666;
@@ -247 +243 @@
 }
 
 .inline-related h3 span.delete {
-    padding-left: 20px;
-    position: absolute;
-    top: 2px;
-    right: 10px;
+    float: right;
 }
 
 .inline-related h3 span.delete label {
@@ -274 +267 @@
     color: #fff;
 }
 
-.inline-related.tabular fieldset.module table {
+. fieldset.module table {
     width: 100%;
 }
 
@@ -282 +275 @@
     border: none;
 }
 
-.inline-group .tabular tr.has_original td {
+. tr.has_original td {
     padding-top: 2em;
 }
 
-.inline-group .tabular tr td.original {
+. tr td.original {
     padding: 2px 0 0 0;
     width: 0;
     _position: relative;
 }
 
-.inline-group .tabular th.original {
+. th.original {
     width: 0px;
     padding: 0;
 }
 
-.inline-group .tabular td.original p {
+. td.original p {
     position: absolute;
     left: 0;
     height: 1.1em;
-    padding: 2px 7px;
+    padding: 2px px;
     overflow: hidden;
     font-size: 9px;
     font-weight: bold;
@@ -325 +318 @@
     padding-left: 14px;
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

django/contrib/admin/media/js/jquery.js

@@ +1 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

django/contrib/admin/options.py

@@ -1187 +1187 @@
 
     def _media(self):
         from django.conf import settings
-        js = []
+        js = []
         if self.prepopulated_fields:
             js.append('js/urlify.js')
         if self.filter_vertical or self.filter_horizontal:
@@ -1238 +1238 @@
 
 class TabularInline(InlineModelAdmin):
     template = 'admin/edit_inline/tabular.html'
+
+
+

django/contrib/admin/__init__.py

@@ -1 +1 @@
 from django.contrib.admin.helpers import ACTION_CHECKBOX_NAME
 from django.contrib.admin.options import ModelAdmin, HORIZONTAL, VERTICAL
-from django.contrib.admin.options import StackedInline, TabularInline
+from django.contrib.admin.options import StackedInline, TabularInline
 from django.contrib.admin.sites import AdminSite, site
 from django.utils.importlib import import_module
 

django/contrib/admin/helpers.py

@@ -195 +195 @@
                 self.opts.prepopulated_fields, None, self.readonly_fields,
                 model_admin=self.model_admin)
 
+
+
     def fields(self):
         fk = getattr(self.formset, "fk", None)
         for i, field in enumerate(flatten_fieldsets(self.fieldsets)):

django/contrib/admin/templates/admin/edit_inline/stacked.html

@@ -1 +1 @@
 {% load i18n %}
-<div class="inline-group">
+<div class="inline-group">
   <h2>{{ inline_admin_formset.opts.verbose_name_plural|title }}</h2>
+
 {{ inline_admin_formset.formset.management_form }}
 {{ inline_admin_formset.formset.non_form_errors }}
 
 {% for inline_admin_form in inline_admin_formset %}
-<div class="inline-related{% if forloop.last %} last-related{% endif %}">
-  <h3><b>{{ inline_admin_formset.opts.verbose_name|title }}:</b>&nbsp;{% if inline_admin_form.original %}{{ inline_admin_form.original }}{% else %} #{{ forloop.counter }}{% endif %}
+<div class="inline-related{% if forloop.last %} {% endif %}">
+  <h3><b>{{ inline_admin_formset.opts.verbose_name|title }}:</b>&nbsp;{% if inline_admin_form.original %}{{ inline_admin_form.original }}{% else %} #{{ forloop.counter }}{% endif %}
         {% if inline_admin_form.show_url %}<a href="../../../r/{{ inline_admin_form.original_content_type_id }}/{{ inline_admin_form.original.id }}/">{% trans "View on site" %}</a>{% endif %}
         {% if inline_admin_formset.formset.can_delete and inline_admin_form.original %}<span class="delete">{{ inline_admin_form.deletion_field.field }} {{ inline_admin_form.deletion_field.label_tag }}</span>{% endif %}
   </h3>
@@ -20 +21 @@
 </div>
 {% endfor %}
 
-{# <ul class="tools"> #}
-{#   <li><a class="add" href="">Add another {{ inline_admin_formset.opts.verbose_name|title }}</a></li> #}
-{# </ul> #}
+<ul class="tools add_inline" id="{{ inline_admin_formset.formset.prefix }}-addinline">
+  <li><a id="{{ inline_admin_formset.formset.prefix }}-add" class="add" href="#">Add a {{ inline_admin_formset.opts.verbose_name }}</a></li>
+</ul>
+
 </div>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

django/contrib/admin/templates/admin/edit_inline/selector.html

@@ +1 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

django/contrib/admin/templates/admin/edit_inline/tabular.html

@@ -1 +1 @@
 {% load i18n %}
-<div class="inline-group">
-  <div class="tabular inline-related {% if forloop.last %}last-related{% endif %}">
+<div class="tabular inline-group" id="{{ inline_admin_formset.formset.prefix }}-group">
 {{ inline_admin_formset.formset.management_form }}
 <fieldset class="module">
    <h2>{{ inline_admin_formset.opts.verbose_name_plural|capfirst }}</h2>
    {{ inline_admin_formset.formset.non_form_errors }}
-   <table>
+   <table>
      <thead><tr>
      {% for is_hidden, label in inline_admin_formset.fields %}
        {% if not is_hidden %}
@@ -20 +19 @@
         {% if inline_admin_form.form.non_field_errors %}
         <tr><td colspan="{{ inline_admin_form.field_count }}">{{ inline_admin_form.form.non_field_errors }}</td></tr>
         {% endif %}
-        <tr class="{% cycle row1,row2 %} {% if inline_admin_form.original or inline_admin_form.show_url %}has_original{% endif %}">
+        <tr class="inline-related {% if forloop.last %}empty_form{% endif %} {% if not inline_admin_formset.opts.order_field %}{% cycle 'row1' 'row2' %} {% endif %}{% if inline_admin_form.original or inline_admin_form.show_url %}has_original{% endif %}"
+             id="{{ inline_admin_formset.formset.prefix }}{% if not forloop.last %}{{ forloop.counter }}{% else %}-empty{% endif %}">
 
         <td class="original">
           {% if inline_admin_form.original or inline_admin_form.show_url %}<p>
@@ -66 +66 @@
    </table>
 
 </fieldset>
-  </div>
 
-  {# <ul class="tools"> #}
-  {#   <li><a class="add" href="">Add another {{ inline_admin_formset.opts.verbose_name|title }}</a></li> #}
-  {# </ul> #}
+<ul class="tools add_inline" id="{{ inline_admin_formset.formset.prefix }}-addinline">
+  
+</ul>
 
 </div>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

django/contrib/contenttypes/generic.py

@@ -399 +399 @@
 
 class GenericTabularInline(GenericInlineModelAdmin):
     template = 'admin/edit_inline/tabular.html'
+
+
+
+

tests/regressiontests/forms/formsets.py

@@ -238 +238 @@
 <li>Choice: <input type="text" name="choices-3-choice" /></li>
 <li>Votes: <input type="text" name="choices-3-votes" /></li>
 
+
 
+
+
+
+
+
+
 # FormSets with deletion ######################################################
 
 We can easily add deletion ability to a FormSet with an argument to

docs/ref/contrib/admin/index.txt

@@ -990 +990 @@
             BookInline,
         ]
 
-Django provides two subclasses of ``InlineModelAdmin`` and they are:
+Django provides t subclasses of ``InlineModelAdmin`` and they are:
 
     * ``TabularInline``
     * ``StackedInline``
+
 
-The difference between these two is merely the template used to render them.
+The difference between these t is merely the template used to render them.
 
 ``InlineModelAdmin`` options
 -----------------------------
@@ -1036 +1037 @@
 to the initial forms. See the
 :ref:`formsets documentation <topics-forms-formsets>` for more information.
 
+
+
+
 ``max_num``
 ~~~~~~~~~~~
 
@@ -1241 +1245 @@
 
     admin.site.register(Product, ProductAdmin)
 
-``django.contrib.contenttypes.generic`` provides both a ``GenericTabularInline``
-and ``GenericStackedInline`` and behave just like any other inline. See the
+``django.contrib.contenttypes.generic`` provides 
+like any other inline. See the
 :ref:`contenttypes documentation <ref-contrib-contenttypes>` for more specific
 information.