Matt Westcott
4af5f3d24d
Add PageViewRestriction model, and apply permission check in the 'serve' view
2014-07-04 15:32:27 +01:00
Matt Westcott
df15ece5dc
Implement before_serve_page hook
2014-07-04 14:44:42 +01:00
Matt Westcott
9cc3614097
Catch the deprecation warning for old-style routes during unit tests
2014-07-04 14:40:29 +01:00
Matt Westcott
6e32b6cf9b
Update Page.route API so that it returns a Page instance rather than an HttpResponse; catch the latter in the 'serve' view for backward compatibility
2014-07-04 14:21:32 +01:00
Matt Westcott
2def3b3859
Merge branch 'kaedroho-issue/408'
2014-07-04 11:54:53 +01:00
Matt Westcott
85976d2a58
Merge branch 'issue/408' of https://github.com/kaedroho/wagtail into kaedroho-issue/408
2014-07-04 11:45:43 +01:00
Karl Hobley
56647908d0
Improved test_post_reorder test
2014-07-04 11:39:42 +01:00
Karl Hobley
c7ec5792f6
Make sure all editors picks are resaved on edit. Fixes #408
...
As we are setting the sort_order manually. The formset doesn't think the editors pick has changed so doesn't save it.
This caused a SQLite test to fail as NULL is always greater than any integer causing ordering to be incorrect.
2014-07-04 11:34:13 +01:00
Karl Hobley
fe3c2e6c0b
Added __repr__ to EditorsPicK
2014-07-04 11:33:34 +01:00
Karl Hobley
14228a56e1
Merge pull request #419 from gasman/serve_preview
...
Use serve_preview() rather than serve() for all preview / moderation / view_draft actions
2014-07-03 17:22:22 +01:00
Matt Westcott
c0d2a70d6d
output a DeprecationWarning if get_page_modes has been overridden
2014-07-03 16:46:10 +01:00
Matt Westcott
26cacbc95a
Merge pull request #417 from kaedroho/wagtailcore-cleanup-3
...
Cleanup a few methods of UserPagePermissionsProxy
2014-07-03 16:06:09 +01:00
Matt Westcott
a1bf11113a
update view_draft and preview_for_moderation to call serve_preview (rather than serve, which for some page models might require additional args/kwargs)
2014-07-03 15:51:24 +01:00
Matt Westcott
493fc29c08
Deprecate the show_as_mode
method in favour of serve_preview
which additionally takes a 'request' argument
2014-07-03 15:31:27 +01:00
Karl Hobley
78abe31b05
Cleanup a few methods of UserPagePermissionsProxy
2014-07-03 15:15:12 +01:00
Matt Westcott
0a38e0b8d3
rename display_modes to preview_modes for consistency
...
Conflicts:
wagtail/wagtailadmin/views/pages.py
2014-07-03 15:03:38 +01:00
Matt Westcott
78481dc846
syntactic sugar for get_page_modes: change it to a property called preview_modes and add a default_preview_mode helper
...
Conflicts:
wagtail/wagtailadmin/views/pages.py
2014-07-03 15:01:35 +01:00
Matt Westcott
dd52ccab2a
Remove X-Requested-With header hacks on the incoming requests to preview_on_edit and preview_on_create - no longer necessary, because we're not passing that request to the preview logic
...
Conflicts:
wagtail/wagtailadmin/views/pages.py
2014-07-03 14:59:34 +01:00
Karl Hobley
91687d923e
Merge pull request #363 from mope/fix-edit-handlers-test
...
Tidy up unit tests
2014-07-03 14:31:46 +01:00
Tom Talbot
c0cb1b6280
Remove mock expected calls from edit handler tests
...
'Expected calls' works differently in Python 2 and 3
2014-07-03 14:11:29 +01:00
Karl Hobley
148fcf04e3
Merge pull request #414 from kaedroho/frontendcache-purge-url
...
Allow purging individual URLs from frontend cache
2014-07-03 13:59:13 +01:00
Tom Talbot
69077927f9
Fix FieldPanel test failures
2014-07-03 13:56:43 +01:00
Karl Hobley
735cfe3767
Use UTC timezone in tests
...
This prevents Django from converting times in tests
2014-07-03 13:44:11 +01:00
Tom Talbot
521f5924f6
Merge branch 'master' into fix-edit-handlers-test
2014-07-03 13:41:05 +01:00
Karl Hobley
c9385ca1ce
frontend cache purge docs change
2014-07-03 13:10:03 +01:00
Karl Hobley
3dc83a961f
Updated changelog
2014-07-03 13:07:18 +01:00
Karl Hobley
25e9249308
Added a couple of missing python version classifiers
2014-07-03 13:06:32 +01:00
Karl Hobley
00347ff6ba
Rearrange static site generation docs
2014-07-03 12:53:11 +01:00
Matt Westcott
f28e43f02f
Merge branch 'master' of github.com:torchbox/wagtail
2014-07-03 12:36:15 +01:00
Matt Westcott
e509871624
Merge branch 'kaedroho-page-duplication'
2014-07-03 12:35:57 +01:00
Matt Westcott
27e935db68
Merge branch 'page-duplication' of https://github.com/kaedroho/wagtail into kaedroho-page-duplication
...
Conflicts:
wagtail/wagtailcore/tests/test_page_model.py
2014-07-03 12:35:43 +01:00
Neal Todd
2f126bda6e
Update index.rst
2014-07-03 12:26:48 +01:00
Tom Talbot
cd14be23c3
Tweak FieldPanel tests
2014-07-03 12:22:44 +01:00
Matt Westcott
45621aa48e
Merge branch 'kaedroho-python3-take2-unicode-literals'
2014-07-03 12:15:50 +01:00
Matt Westcott
9938ecf960
add py32-dj16-sqlite to the list of tox environments that fail due to iteritems in South
2014-07-03 12:11:34 +01:00
Matt Westcott
d4cfb434d5
Merge branch 'python3-take2-unicode-literals' of https://github.com/kaedroho/wagtail into kaedroho-python3-take2-unicode-literals
2014-07-03 11:51:03 +01:00
Karl Hobley
e1721030dc
Exclude filter fields from _all. Explicitly include search fields in _all
2014-07-03 11:46:29 +01:00
Tom Talbot
d7f1e317f0
Merge branch 'master' into fix-edit-handlers-test
...
Conflicts:
wagtail/wagtailembeds/tests.py
2014-07-03 11:44:45 +01:00
Tom Talbot
de3f852e43
Removed EditHandler tests. Added more FieldPanel tests
2014-07-03 11:41:23 +01:00
Karl Hobley
584f5a7049
Index fields with correct type in ElasticSearch
...
Previously, everything was converted to a string before indexing in ElasticSearch.
This caused issues where certian filters may not work as expected (such as a greater than filter on an integer field)
This commit changes this by adding type conversion into the ElasticSearch backend.
2014-07-03 11:38:06 +01:00
Karl Hobley
673da4ab02
Set index:'not_analysed' setting on content_type field
2014-07-03 11:33:04 +01:00
Karl Hobley
4a70a4251b
Give some feedback from the add_bulk command
2014-07-03 11:32:05 +01:00
Karl Hobley
b1fb9dc2e2
Fixed a few more double quotes
2014-07-03 11:32:05 +01:00
Karl Hobley
6847109bb9
Removed 'object_indexed' check from update_index command
...
Conflicts:
wagtail/wagtailsearch/management/commands/update_index.py
2014-07-03 11:32:04 +01:00
Karl Hobley
f2d1c80378
Don't run tests with wagtailsearch signal handlers enabled
2014-07-03 11:32:04 +01:00
Karl Hobley
67ed563dd7
Made quotes more consistant
2014-07-03 11:32:04 +01:00
Karl Hobley
6d21727b03
Cleaned up database backend search method
2014-07-03 11:29:33 +01:00
Karl Hobley
5e76a54b2b
Remove any duplicate search fields of the same type
2014-07-03 11:29:33 +01:00
Karl Hobley
0aca9ece65
Moved field mapping generation code into ElasticSearchMapping class
2014-07-03 11:27:54 +01:00
Karl Hobley
8bb3703c6e
Created get_field_mapping method on ElasticSearchMapping class
2014-07-03 11:26:16 +01:00