Hopiu/wagtail
1
0
Fork 0
mirror of https://github.com/Hopiu/wagtail.git synced 2026-05-12 09:13:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
3237 commits 30 branches 112 tags 89 MiB
Commit graph

3237 commits

This branch
This branch
All branches
Author SHA1 Message Date
Matt Westcott
24fa2d5d0c PageChooserBlock WIP: refactor FieldBlock so that the field object can be constructed lazily 2015-02-06 09:47:50 +00:00
Matt Westcott
91dd196a24 Merge branch 'feature/streamfield' of github.com:torchbox/wagtail into feature/streamfield 2015-02-05 16:34:00 +00:00
Matt Westcott
e223cac658 call expand_db_html in the native rendering of RichTextBlock 2015-02-05 16:33:52 +00:00
Karl Hobley
0cff753544 Blocks tests tweaks 2015-02-05 16:26:39 +00:00
Matt Westcott
f3a66d34af implement RichTextBlock, and ensure that script tags embedded in html_declarations bodies are properly escaped 2015-02-05 16:23:31 +00:00
Karl Hobley
863cffeb36 Tests for StreamBlock 2015-02-05 16:04:29 +00:00
Dave Cranwell
144a130e44 stream menu should use label for the button it creates 2015-02-05 15:53:53 +00:00
Dave Cranwell
151a8da6d9 Merge branch 'feature/streamfield' of github.com:torchbox/wagtail into feature/streamfield 2015-02-05 15:42:54 +00:00
Dave Cranwell
f04c407ffb add suitable icons to wagtail's own icon set and allowing user to define icon for each streamfield block 2015-02-05 15:42:52 +00:00
Karl Hobley
161aa50a9e Test tweaks 2015-02-05 15:33:42 +00:00
Matt Westcott
959feec13a Merge branch 'feature/streamfield' of github.com:torchbox/wagtail into feature/streamfield 2015-02-05 15:02:42 +00:00
Matt Westcott
2ad0366fa0 make the base Block.render template-aware, so that any subclass can define a 'template' property to override the default rendering (which is now provided by block.render_basic()) 2015-02-05 15:00:56 +00:00
Karl Hobley
c115addf1a Added tests for ListBlock 2015-02-05 13:09:50 +00:00
Matt Westcott
3f82c1bc0b Merge branch 'feature/streamfield' of github.com:torchbox/wagtail into feature/streamfield 2015-02-05 12:31:34 +00:00
Matt Westcott
ac1bee89c9 Have StreamChild.__str__ return the child's native rendering so that it's usable on templates. (StreamChild isn't just syntactic sugar after all, then...) 2015-02-05 12:31:24 +00:00
Karl Hobley
bafd5dca3c Tests for StructBlock 2015-02-05 12:30:15 +00:00
Matt Westcott
6f1740b08b add some syntactic sugar so that we can refer to child.block_type when looping over a StreamValue 2015-02-05 12:23:26 +00:00
Matt Westcott
26d6022752 Merge branch 'feature/streamfield' of github.com:torchbox/wagtail into feature/streamfield 2015-02-05 12:08:40 +00:00
Matt Westcott
94a248055b Refactor StreamValue so that it behaves as a sequence of BoundBlocks rather than a sequence of values 2015-02-05 12:08:33 +00:00
Karl Hobley
36ed0ec99d Added tests for FieldBlock 2015-02-05 11:48:37 +00:00
Dave Cranwell
67b0ffd09c beginning styling of stream menus 2015-02-05 11:40:37 +00:00
Matt Westcott
2a485e499e define the default value of a StreamBlock to be an empty StreamValue, not a list 2015-02-05 11:22:17 +00:00
Matt Westcott
89e5f74521 StreamField.to_python needs to return an empty StreamValue for None, not an empty list 2015-02-05 11:12:21 +00:00
Matt Westcott
53e1ee44e5 ditch HeadingBlock in favour of a CharBlock that doesn't know its own native rendering 2015-02-05 10:46:59 +00:00
Matt Westcott
0afb1a3b50 make StreamField behave correctly for migrations 2015-02-04 19:03:15 +00:00
Matt Westcott
7f3c0f5af0 Pick up the StreamBlock definition from the model field, so that we don't need to pass it to the StreamFieldPanel constructor 2015-02-04 16:56:35 +00:00
Matt Westcott
00f50781d1 Merge branch 'master' into feature/streamfield-frontend 
Conflicts:
	wagtail/wagtailadmin/edit_handlers.py
 2015-02-04 16:47:14 +00:00
Karl Hobley
88812b4cae Release notes for #957 and #960 2015-02-04 16:17:16 +00:00
Karl Hobley
ed6e13f171 Changelogs for #957 and #960 2015-02-04 16:15:58 +00:00
Karl Hobley
ed9a8d1169 Merge pull request #960 from gasman/feature/model-aware-edithandlers 
Refactor edit handler classes so that they can have a persistent reference to their corresponding model
 2015-02-04 16:12:43 +00:00
Tom Talbot
f9da1c5ed8 Added Sebastian Spiegel to contributors 2015-02-04 16:00:59 +00:00
Tom Talbot
67369f4e6c Release notes for #825 2015-02-04 16:00:38 +00:00
Tom Talbot
27048acda7 Changelog for #825 2015-02-04 16:00:13 +00:00
Tom Talbot
c38e3e1b6e Merge pull request #825 from Tivix/fix-multiword-tags-save 
Fix saving a single tag with multiple words in it, fixes #824
 2015-02-04 15:48:37 +00:00
Karl Hobley
e9b0f8d928 Merge pull request #957 from gasman/fix/stray-form-fields-2 
Stop missing panels from displaying as stray unlabelled fields - fixes #338 and #922
 2015-02-04 09:38:55 +00:00
Matt Westcott
d82069543f Merge pull request #959 from zerolab/docs-wagtail-planet 
Add third-party tutorials page to docs
 2015-02-03 23:22:38 +00:00
Matt Westcott
121c01c7f7 Refactor edit handler classes so that they can have a persistent reference to their corresponding model. 
Previously, TabbedInterface, ObjectList, FieldPanel et al were factory functions that yield a class that has no knowledge of their corresponding models. These are now classes in their own right, meaning that when we place them in a content_panels definition, we end up with a list of 'panel definition' objects rather than a list of EditHandler classes. These panel definition objects can be 'traded in' for a proper EditHandler class by calling bind_to_model(model) - this means that our EditHandler classes are now aware of the model they are attached to.

Since bind_to_model(model) returns a fresh class each time it is called, the panel definition objects can be shared between models with no issues - so we can still make use of common definitions like wagtaildemo's LinkFields.panels.
 2015-02-03 23:00:08 +00:00
Dan Braghis
0aaee7bb47 Add docs page for third-party tutorials 2015-02-03 22:29:28 +00:00
Matt Westcott
401c50ca5d Merge pull request #955 from gasman/fix/modelcluster-0.5 
upgrade django-modelcluster to 0.5
 2015-02-03 16:53:05 +00:00
Matt Westcott
6faf4f3722 Pass InlinePanel's widget overrides as part of the required_formsets spec, so there's no need for a separate widget_overrides method 2015-02-03 13:29:17 +00:00
Matt Westcott
25a514ae5c add test for widget overriding within an InlinePanel 2015-02-03 13:12:22 +00:00
Matt Westcott
cc237c1750 Update EditHandler.required_formsets to return a dict (as supported by django-modelcluster 0.5), so that InlinePanel can specify the exact fields to use 2015-02-03 12:58:39 +00:00
Matt Westcott
18c77b83a6 reinstate render_missing_fields - it turns out we need it in order to render the id / DELETE / ORDER etc hidden fields on inline panels 2015-02-03 12:58:39 +00:00
Matt Westcott
8ae1ccdff6 update comment on render_form_content, since the concept of 'unaccounted-for fields' no longer applies 2015-02-03 12:58:39 +00:00
Matt Westcott
f821eafa26 negate the test for #338 / #922, to confirm that this is fixed 2015-02-03 12:58:39 +00:00
Matt Westcott
30f2049727 add content_panels definition to TaggedPage, so that TestIssue197 is not relying on the 'tags' field being output as a stray non-panel field (which it isn't any more) 2015-02-03 12:58:39 +00:00
Matt Westcott
ba19fd395d Update edit_handlers tests to reflect the change from rendered_fields to required_fields 2015-02-03 12:58:39 +00:00
Matt Westcott
8d903e9936 Replace rendered_fields method of EditHandler with a class method required_fields, and use that to tell get_form_for_model what fields the form should include. This means we can eliminate render_missing_fields, since the form no longer includes extraneous fields 2015-02-03 12:55:23 +00:00
Chris Rogers
7d792151c2 Merge pull request #946 from gasman/fix/ignore-middleware-responses 
Ignore middleware responses when building dummy request
 2015-02-03 12:21:09 +00:00
Matt Westcott
55cac3b907 upgrade django-modelcluster to 0.5 2015-02-03 11:11:42 +00:00