Commit graph

8303 commits

Author SHA1 Message Date
Karl Hobley
76ef1eb41a Fixed spelling mistake 2015-02-12 12:45:38 +00:00
Karl Hobley
29caba921e Added tests for docs serve view 2015-02-12 12:32:22 +00:00
Matt Westcott
b912655298 Merge branch 'feature/streamfield' of github.com:torchbox/wagtail into feature/streamfield 2015-02-12 12:31:49 +00:00
Dan Braghis
918f286eea Use StreamingHttpResponse to server documents 2015-02-12 11:39:31 +00:00
Dan Braghis
f36836bc48 Change FileWrapper import location 2015-02-12 11:39:17 +00:00
Matt Westcott
246068faa6 Hook up clean() method to BlockField
(actual error reporting is a bit rubbish at the moment though)
2015-02-11 17:43:59 +00:00
Dave Cranwell
ac25b027cf ongoing fighting with list elements 2015-02-11 17:01:40 +00:00
Matt Westcott
be67d70112 Introduce a BlockField form field type for use with the StreamField model field.
This uses BlockWidget by default, so we no longer need widget_overrides in the StreamFieldPanel edit handler.
2015-02-11 16:31:03 +00:00
Dave Cranwell
bba8b2cb36 tweak to position of delete button 2015-02-11 16:19:34 +00:00
Matt Westcott
f7e6fcc7b5 move wagtailadmin.widgets.StreamWidget to wagtailadmin.blocks.BlockWidget
This keeps all block-API related code in one module, and reflects the fact that BlockWidget is not inherently tied to StreamBlock in particular.
2015-02-11 16:04:14 +00:00
Dave Cranwell
cfd9509b71 Merge branch 'feature/streamfield' of github.com:torchbox/wagtail into feature/streamfield 2015-02-11 14:10:48 +00:00
Dave Cranwell
659ac2c523 tweak to menu toggle 2015-02-11 14:10:46 +00:00
Matt Westcott
194535120a New ListBlocks should consist of one empty item by default 2015-02-11 13:38:23 +00:00
Matt Westcott
4603701a59 Merge branch 'feature/streamfield' of github.com:torchbox/wagtail into feature/streamfield 2015-02-11 13:30:37 +00:00
Matt Westcott
bfefcf3bb1 treat empty string as an empty value on StreamField too 2015-02-11 13:30:26 +00:00
Karl Hobley
56e398fd64 Changed a unittest.skipto unittest.expectedFailure 2015-02-11 12:57:56 +00:00
Karl Hobley
85aee81808 Fixed system checks import 2015-02-11 12:56:17 +00:00
Dave Cranwell
f06e2450ce Merge branch 'feature/streamfield' of github.com:torchbox/wagtail into feature/streamfield 2015-02-11 12:52:31 +00:00
Dave Cranwell
450653355b tweaks to aid keyboard nav 2015-02-11 12:52:29 +00:00
Matt Westcott
85902d111d implement SnippetChooserBlock 2015-02-11 12:39:44 +00:00
Matt Westcott
dfb2a999f4 Merge branch 'feature/streamfield' of github.com:torchbox/wagtail into feature/streamfield 2015-02-11 12:20:38 +00:00
Matt Westcott
76b0964c94 add DocumentChooserBlock 2015-02-11 12:20:32 +00:00
Dave Cranwell
b6436f71b8 Merge branch 'feature/streamfield' of github.com:torchbox/wagtail into feature/streamfield 2015-02-11 11:57:52 +00:00
Dave Cranwell
7a5c77702f improved way of specifying text styles for individual blocks or fields within blocks 2015-02-11 11:57:50 +00:00
Matt Westcott
628b7947dc implement ImageChooserBlock 2015-02-11 11:56:43 +00:00
Matt Westcott
887954ec31 Merge branch 'streamfield-chooser-wip' into feature/streamfield 2015-02-11 10:34:35 +00:00
Matt Westcott
e01167ff1f pull re-usable methods of PageChooserBlock into an abstract superclass 2015-02-11 10:34:11 +00:00
Dave Cranwell
d0bbd644bf Merge branch 'feature/streamfield' of github.com:torchbox/wagtail into feature/streamfield 2015-02-11 10:31:43 +00:00
Dave Cranwell
dc6b06e585 tweaks to make menu toggle work cleaner 2015-02-11 10:31:40 +00:00
Matt Westcott
d11205454b fix PageChooserBlock to return a page object rather than an ID.
AdminPageChooser has been tweaked to accept either an ID or an instance as its input value, and FieldBlock now passes the result of value_from_datadict through to_python to deal with the case where the widget doesn't return our expected type.
2015-02-11 01:21:24 +00:00
Matt Westcott
34bd4bd974 first pass at to_python and get_prep_value on PageChooserBlock 2015-02-10 23:29:20 +00:00
Karl Hobley
51b384ece2 Add migration for tests app 2015-02-10 16:59:29 +00:00
Matt Westcott
19b13a090a Merge branch 'master' into feature/streamfield
Conflicts:
	wagtail/wagtailadmin/widgets.py
2015-02-10 16:34:32 +00:00
Matt Westcott
6a31d75aa8 Merge branch 'feature/streamfield' of github.com:torchbox/wagtail into feature/streamfield 2015-02-10 16:31:28 +00:00
Karl Hobley
22134b414c A couple of tests for ListBlock.render 2015-02-10 16:23:45 +00:00
Matt Westcott
3129d4e029 Merge branch 'feature/streamfield' of github.com:torchbox/wagtail into feature/streamfield 2015-02-10 15:52:38 +00:00
Matt Westcott
75c07af32a Additional 0.9 deprecation notes 2015-02-10 15:06:38 +00:00
Karl Hobley
121d0bdc69 Use builtin wagtail image model in tests
Incase we test with a custom image model in the future
2015-02-10 14:35:40 +00:00
Karl Hobley
8bb392ae58 Use old behaviour when admin_form_fields not set
With deprecation warning
2015-02-10 14:31:07 +00:00
Karl Hobley
6581a78082 Fixed admin_form_fields tests 2015-02-10 14:06:18 +00:00
Matt Westcott
17ccb29371 Merge branch 'feature/chooser-refactor' 2015-02-10 10:44:21 +00:00
Karl Hobley
ef8de6180a Added admin_form_fields to Image model
In Django 1.7, creating forms from a model without specifying a list of fields is deprecated.

This commit makes the get_image_form function look for a field called admin_form_fields on the Image model and use that for building the form.
2015-02-10 10:33:09 +00:00
Karl Hobley
0dd1613287 Project template Vagrantfile now listens on port 8000 2015-02-10 10:02:39 +00:00
Matt Westcott
9a3893798e py3 fix 2015-02-09 21:25:31 +00:00
Matt Westcott
e3dc4a5936 cast an empty string value of AdminChooser to None, as needed by required=True validation 2015-02-09 19:56:51 +00:00
Matt Westcott
13e1811c54 mark chooser_panel.html as deprecated 2015-02-09 19:34:18 +00:00
Matt Westcott
63dafbe4b7 Move the snippet chooser HTML markup from snippet_chooser_panel.html entirely within the AdminSnippetChooser widget's render() method 2015-02-09 19:18:58 +00:00
Matt Westcott
435e4571b3 Move the image chooser HTML markup from image_chooser_panel.html entirely within the AdminImageChooser widget's render() method 2015-02-09 19:08:12 +00:00
Matt Westcott
41577759a1 Move the document chooser HTML markup from document_chooser_panel.html entirely within the AdminDocumentChooser widget's render() method 2015-02-09 18:59:51 +00:00
Matt Westcott
fe797437e7 Remove now-redundant references to page_chooser_panel.html 2015-02-09 18:47:11 +00:00