From 62523016ccdcc6820a3d72471c867e62ddb3c85a Mon Sep 17 00:00:00 2001 From: Zain Memon Date: Sun, 7 Jun 2009 07:05:27 +0000 Subject: [PATCH] [soc2009/admin-ui] First steps to dynamically add stacked inlines. Upon loading the change list page, all extra inline fields are hidden and an "Add" link is shown at the bottom. Currently, clicking on the link will only re-show the hidden extra inlines; it won't add any new ones. Proper addition is going to be in the next check-in. git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/admin-ui@10939 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/contrib/admin/media/css/forms.css | 3 ++ django/contrib/admin/options.py | 3 +- .../templates/admin/edit_inline/stacked.html | 34 ++++++++++++++++--- 3 files changed, 35 insertions(+), 5 deletions(-) diff --git a/django/contrib/admin/media/css/forms.css b/django/contrib/admin/media/css/forms.css index fbe4b753af..bda0ce26d9 100644 --- a/django/contrib/admin/media/css/forms.css +++ b/django/contrib/admin/media/css/forms.css @@ -325,3 +325,6 @@ fieldset.monospace textarea { padding-left: 14px; } +.add_inline { + display: none; +} \ No newline at end of file diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py index 8297eca74e..b3280e7779 100644 --- a/django/contrib/admin/options.py +++ b/django/contrib/admin/options.py @@ -868,6 +868,7 @@ class ModelAdmin(BaseModelAdmin): 'root_path': self.admin_site.root_path, 'app_label': opts.app_label, } + #import ipdb; ipdb.set_trace() context.update(extra_context or {}) return self.render_change_form(request, context, change=True, obj=obj) change_view = transaction.commit_on_success(change_view) @@ -1122,7 +1123,7 @@ class InlineModelAdmin(BaseModelAdmin): def _media(self): from django.conf import settings - js = [] + js = ['js/jquery.js'] if self.prepopulated_fields: js.append('js/urlify.js') if self.filter_vertical or self.filter_horizontal: diff --git a/django/contrib/admin/templates/admin/edit_inline/stacked.html b/django/contrib/admin/templates/admin/edit_inline/stacked.html index 494c351279..f8c86236ff 100644 --- a/django/contrib/admin/templates/admin/edit_inline/stacked.html +++ b/django/contrib/admin/templates/admin/edit_inline/stacked.html @@ -5,7 +5,7 @@ {{ inline_admin_formset.formset.non_form_errors }} {% for inline_admin_form in inline_admin_formset %} -
+

{{ inline_admin_formset.opts.verbose_name|title }}: {% if inline_admin_form.original %}{{ inline_admin_form.original }}{% else %} #{{ forloop.counter }}{% endif %} {% if inline_admin_formset.formset.can_delete and inline_admin_form.original %}{{ inline_admin_form.deletion_field.field }} {{ inline_admin_form.deletion_field.label_tag }}{% endif %}

@@ -22,7 +22,33 @@
{% endfor %} -{# #} + +
+ +