Commit graph

8303 commits

Author SHA1 Message Date
Matt Westcott
7785beecc6 Allow AdminPageChooser edit link to be hidden, and hide it on the page permissions interface 2015-08-12 17:08:22 +01:00
Matt Westcott
7c26217ea0 Remove 'Clear choice' action from page chooser in page permissions interface.
This appeared because we reassigned the field's 'widget' attribute after the field was initialised - this means that the field never gets to pass its 'required=True' flag on to the widget. We avoid this by defining the field as a whole, in the Django-approved way (which also means we don't need to override __init__).
2015-08-12 16:13:44 +01:00
Alex Gleason
af901c3706 Fixes #1298 2015-08-11 23:01:39 -05:00
Matt Westcott
e867b48446 Merge pull request #1593 from torchbox/revert-1581-multiple-page-types-in-page-chooser
Revert "Multiple page types in page chooser"
2015-08-11 18:00:25 +01:00
Matt Westcott
85707d5925 Revert "Multiple page types in page chooser" 2015-08-11 18:00:05 +01:00
Matt Westcott
31c6198afb Merge pull request #1592 from torchbox/revert-1590-fix-1581
Revert "Fix a couple of bugs in #1581"
2015-08-11 17:59:49 +01:00
Matt Westcott
90ebd2ed73 Revert "Fix a couple of bugs in #1581" 2015-08-11 17:59:38 +01:00
Karl Hobley
e1cb885de2 Merge pull request #1590 from kaedroho/fix-1581
Fix a couple of bugs in #1581
2015-08-11 17:08:44 +01:00
Karl Hobley
3550a17401 Fix crash
content_types is a dictionary of model classes => content types.

content_type__in requires a list of content types so .values() is called
2015-08-11 16:44:37 +01:00
Karl Hobley
4aabac1bdc JS changes for #1581
These got lost somehow...
2015-08-11 16:43:57 +01:00
Tom Dyson
f8d2a9f456 Merge pull request #1565 from gasman/fix/remove-menu-classes
Remove all menu-{section_name} classnames on the <body> element and menu item <li>s
2015-08-11 12:39:03 +01:00
Tom Dyson
de78b8d609 Merge pull request #1573 from kaedroho/fix-editorspicks-references
Fixed a couple of references to editors picks
2015-08-11 12:33:44 +01:00
Michael van Tellingen
51bf76ba70 Don't call Site.get_root_paths() twice in Page.url property 2015-08-08 15:54:01 +02:00
hanpama
de3d22b8da Correct omitted parameter in assertion 2015-08-08 02:34:38 +09:00
hanpama
4f761136d4 Remove unused local var and Fix some indentations 2015-08-07 22:12:38 +09:00
hanpama
e819de91b5 Fix URL names with namespace 2015-08-07 22:03:10 +09:00
hanpama
0f4514752c Pull and Merge torchbox master 2015-08-07 21:17:34 +09:00
hanpama
3723a15eec Edit some comments 2015-08-07 21:12:54 +09:00
hanpama
407f18a922 Write testcase for delete submission view 2015-08-07 21:07:22 +09:00
Karl Hobley
337a979257 #1582 - Fix typo in model reference 2015-08-05 14:13:00 +01:00
Karl Hobley
5b123ca5f4 Deterministic ordering for tags 2015-08-03 20:27:22 +01:00
Karl Hobley
1d0fa2a3bf Various tweaks and fixes 2015-08-03 20:24:51 +01:00
Tom Dyson
7c784dec70 Merge pull request #1581 from nimasmi/multiple-page-types-in-page-chooser
Multiple page types in page chooser
2015-08-03 20:18:21 +01:00
Karl Hobley
fdb3e4905e Merge pull request #1576 from kaedroho/issue/1574
Removed references to search picks from project template
2015-08-03 20:09:52 +01:00
Karl Hobley
6d92ca4f3a Moved page model specific check into PageSerializer 2015-08-03 20:01:26 +01:00
Karl Hobley
c2706ac6d4 Split serialize_fields out of to_representation
Makes some code look a bit better
2015-08-03 19:49:08 +01:00
Karl Hobley
2a79ee7b09 serialize_object_metadata => serialize_meta 2015-08-03 19:40:54 +01:00
Karl Hobley
f669166128 serialize_object is now to_representation 2015-08-03 19:39:31 +01:00
Karl Hobley
b3ca0412f5 Merged BaseSerializer with WagtailSerializer
Previously, WagtailSerializer and it's subclasses were responsible for serializing objects and it delegated serializing the dynamic fields to automatically generated subclasses of BaseSerializer.

Now, these have been merged and all serializers are generated automatically for a particular request. The responsibility of generating the serializers is now in the endpoint.
2015-08-03 19:38:08 +01:00
Karl Hobley
32d0170882 Moved responsibility of getting fields for request to endpoint 2015-08-03 19:08:24 +01:00
Nick Smith
b67426c86b Merge branch 'master' into multiple-page-types-in-page-chooser
Conflicts:
	wagtail/wagtailadmin/views/chooser.py
2015-08-03 18:11:38 +01:00
Nick Smith
38ee0991e6 Update #1533 according to feedback: docs and error message changes 2015-08-03 18:08:20 +01:00
Karl Hobley
2d691cd6e7 Simplified handling of show_details flag in serializers 2015-08-03 17:20:30 +01:00
Karl Hobley
b4d0a6aded Simplified handling of request object in serializers 2015-08-03 17:17:11 +01:00
Karl Hobley
0b77112bf3 Moved get_serializer_field logic into base serializer class 2015-08-03 17:16:41 +01:00
Karl Hobley
199f15f3a3 Cleanup get_serializer_fields 2015-08-03 14:52:54 +01:00
Karl Hobley
fd821179cd Merge pull request #1580 from benebun/patch-1
Fix typo templage > template
2015-08-03 14:38:10 +01:00
Karl Hobley
f1f73461c5 Goodbye, get_api_data 2015-08-03 14:37:27 +01:00
Karl Hobley
a353f803e9 Use rest frameworks serializers 2015-08-03 14:37:27 +01:00
Karl Hobley
85a4209893 Use rest frameworks fields API 2015-08-03 14:37:26 +01:00
Karl Hobley
4523f8b5cc Refactored get_api_data into classes 2015-08-03 14:37:26 +01:00
Karl Hobley
30408252ff Contributor/changelog/release note for #1538 2015-08-03 14:35:58 +01:00
Benedikt Breinbauer
ea77a0f7b9 Fix typo templage > template 2015-08-03 15:35:32 +02:00
Karl Hobley
94ad915fee Merge pull request #1538 from tomchristie/rest-framework
Refactor API to REST framework.
2015-08-03 14:33:49 +01:00
Karl Hobley
62a5f4125e Removed references to search picks from project template
Fixes #1574
2015-08-03 10:19:29 +01:00
Karl Hobley
c553a122eb Merge pull request #1575 from theju/master
Update the urls to make use of namespaced URLs
2015-08-02 22:44:24 +01:00
Thejaswi Puthraya
31867e74c0 Update the urls to make use of namespaced URLs 2015-08-02 16:49:25 +00:00
Karl Hobley
9efb91d406 Fixed a couple of references to editors picks
Requires translation sources to be regenerated
2015-08-02 11:18:15 +01:00
Karl Hobley
3afeff8e15 Merge pull request #1570 from gasman/fix/remove-urlconf-check
Remove check for pre-Wagtail-0.3 urlconfs in wagtailimages
2015-08-01 12:04:50 +01:00
Matt Westcott
ea2cabca98 Release note for #1492 2015-08-01 11:22:59 +02:00