diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-08-21 00:48:23 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-08-21 00:48:23 +0200 |
| commit | 0dec1cea3c49a29d44767ecf4000194755f74a5a (patch) | |
| tree | 799c921c32b1c0dc0dcf06a5901047aaba18bbc5 | |
| parent | ce0340030c1b35e81903ab78024c5f7caa067af6 (diff) | |
| download | Chimère-0dec1cea3c49a29d44767ecf4000194755f74a5a.tar.bz2 Chimère-0dec1cea3c49a29d44767ecf4000194755f74a5a.zip | |
Allow specific multimedia et picture formset for get_edit_page
| -rw-r--r-- | chimere/views.py | 12 | ||||
| -rw-r--r-- | chimere/widgets.py | 2 |
2 files changed, 8 insertions, 6 deletions
diff --git a/chimere/views.py b/chimere/views.py index 3150258..f61e209 100644 --- a/chimere/views.py +++ b/chimere/views.py @@ -134,7 +134,9 @@ def index(request, area_name=None, default_area=None, simple=False): return render_to_response(tpl, response_dct, context_instance=RequestContext(request)) -def get_edit_page(redirect_url, item_cls, item_form): +def get_edit_page(redirect_url, item_cls, item_form, + multimediafile_formset=MultimediaFileFormSet, + picturefile_formset=PictureFileFormSet): """ Edition page """ @@ -183,9 +185,9 @@ def get_edit_page(redirect_url, item_cls, item_form): form = item_form(request.POST, request.FILES, instance=inst, subcategories=listed_subcats) - formset_multi = MultimediaFileFormSet(request.POST, request.FILES, + formset_multi = multimediafile_formset(request.POST, request.FILES, initial=init_multi, prefix='multimedia') - formset_picture = PictureFileFormSet(request.POST, request.FILES, + formset_picture = picturefile_formset(request.POST, request.FILES, initial=init_picture, prefix='picture') # All validation rules pass if form.is_valid() and formset_multi.is_valid() and \ @@ -230,9 +232,9 @@ def get_edit_page(redirect_url, item_cls, item_form): u" and/or errors in the submited form.") else: form = item_form(instance=init_item, subcategories=listed_subcats) - formset_multi = MultimediaFileFormSet(initial=init_multi, + formset_multi = multimediafile_formset(initial=init_multi, prefix='multimedia') - formset_picture = PictureFileFormSet(initial=init_picture, + formset_picture = picturefile_formset(initial=init_picture, prefix='picture') return None, (item_id, init_item, response_dct, form, formset_multi, formset_picture), subcategories diff --git a/chimere/widgets.py b/chimere/widgets.py index da2bc54..8e2b8ad 100644 --- a/chimere/widgets.py +++ b/chimere/widgets.py @@ -117,7 +117,7 @@ class DatePickerWidget(forms.TextInput): def render(self, *args, **kwargs): rendered = super(DatePickerWidget, self).render(*args, **kwargs) rendered += u"\n<script type='text/javascript'>\n"\ - u" $('#%s').datepicker({ dateFormat: 'yy-mm-dd' });\n"\ + u" $(function() {$('#%s').datepicker({ dateFormat: 'yy-mm-dd' });});\n"\ u"</script>\n" % kwargs['attrs']['id'] return mark_safe(rendered) |