Commit graph

5442 commits

Author SHA1 Message Date
Matt Westcott
b1c75644f6 Stop replace_text from replacing multiple times on MTI subclasses.
Iterating over get_page_models means that these will be visited once
per superclass. To avoid this, we filter the page list to those exactly
matching the page class. This is done via a new `exact_type` method
on `PageQuerySet`.
2015-12-01 12:35:31 +00:00
Matt Westcott
1bb74ee4d0 Remove special case allowing all page types to be children of Page.
This was required when Page was absent from PAGE_MODEL_CLASSES (due to
it being 'abstract' / non-creatable) and thus never appeared in a
parent_page_types list. Now it appears in PAGE_MODEL_CLASSES, and is
a valid parent page type for page types that do not specify
parent_page_types (or explicitly include Page in the list).
2015-12-01 12:35:30 +00:00
Matt Westcott
5104643438 Change PAGE_MODEL_CLASSES to include is_creatable pages 2015-12-01 12:35:30 +00:00
Matt Westcott
11d7e35423 Merge pull request #1983 from kaedroho/drone-images
Added Drone Dockerfiles to /scripts
2015-12-01 11:01:40 +00:00
Karl Hobley
e8d022b398 Added Drone Dockerfiles to /scripts 2015-12-01 10:56:23 +00:00
Matt Westcott
60ea0427fb Formally deprecate ContentType-returning methods in wagtailcore 2015-12-01 10:22:48 +00:00
Matt Westcott
9f1993ad10 Eliminate remaining uses of allowed_subpage_types 2015-12-01 10:22:48 +00:00
Matt Westcott
5e84900adb Add tests for allowed_parent_page_models and allowed_subpage_models.
We don't want to only test these indirectly via allowed_*_types, because
allowed_*_models is the preferred interface.
2015-12-01 10:22:48 +00:00
Matt Westcott
4ce93ac381 Deduplicate code for converting a list of models to a list of ContentTypes 2015-12-01 10:22:48 +00:00
Matt Westcott
b572edbd9e Remove _PAGE_CONTENT_TYPES cache.
No code within Wagtail uses get_page_types now, and it doesn't really matter if external code becomes infinitessimally slower...
2015-12-01 10:22:48 +00:00
Matt Westcott
e12523820d Add an allowed_subpage_models method to supersede allowed_subpage_types 2015-12-01 10:22:48 +00:00
Matt Westcott
d182115d2a Add an allowed_parent_page_models method to supersede allowed_parent_page_types 2015-12-01 10:22:48 +00:00
Matt Westcott
54ad787131 Add a clean_parent_page_models method to supersede clean_parent_page_types 2015-12-01 10:22:48 +00:00
Matt Westcott
71f970f9aa Add a clean_subpage_models method to supersede clean_subpage_types 2015-12-01 10:22:48 +00:00
Matt Westcott
7b35f3ec6d use get_page_models instead of get_page_types in wagtailforms 2015-12-01 10:22:47 +00:00
Matt Westcott
9a0c4225b5 Use get_page_models instead of get_page_types in replace_text command 2015-12-01 10:22:47 +00:00
Matt Westcott
06897db7c5 Add a get_page_models function to wagtailcore.models; deprecate direct use of PAGE_MODEL_CLASSES 2015-12-01 10:22:47 +00:00
Matt Westcott
c35ae95d9b Document the remaining PageQuerySet methods 2015-11-30 22:16:08 +00:00
Tom Dyson
95d9a27c7b Merge pull request #1977 from tomdyson/master
Document setting for case-insensitive tags
2015-11-30 21:27:43 +00:00
Tom Dyson
ef58ea3429 Document setting for case-insensitive tags 2015-11-30 18:07:08 +00:00
Tim Heap
1d4a276f49 Use SiteManager for Sites, add tests
The SiteManager class was not used on the Site model, or anywhere else.

This was not caught by the tests, because nothing tested the relevant
attributes on the Site model, nor were they used in the code base. Tests
have been added now.
2015-11-30 14:35:25 +00:00
Karl Hobley
06cba807df Merge pull request #1914 from kaedroho/runtests-args
Add --postgres and --elasticsearch arguments to runtests.py
2015-11-30 12:26:16 +00:00
Matt Westcott
e5abe8df96 Release note for #1969 2015-11-27 16:15:21 +00:00
Matt Westcott
4758c89a3c Add keyboard shortcuts for preview and save 2015-11-27 16:12:00 +00:00
Dave Cranwell
7845cb409b Merge pull request #1965 from davecranwell/fix-nav-toggle-size
Nav toggle icon had somehow lost specificity over time
2015-11-27 10:46:23 +00:00
Dave Cranwell
7333ae520f nav toggle had somehow lost specificity over time, causing it to appear tiny. 2015-11-27 10:34:25 +00:00
alx
88e477098f Ensure that locked pages can't be unpublished.
Fixes #1615
2015-11-24 12:58:02 +00:00
Tim Heap
f4968de0f9 Allow overriding attributes in {% image %} tag
The `alt` attribute that was automatically generated as part of the
`{% image %}` tag could not be overridden. If template authors passed
their own `alt="..."` attribute in, two would be printed out instead
of the default one being overridden.

The relevant code has been refactored to build a dict of attributes,
allowing the default set to be overridden, and then printing them using
`flatatt`.

Fixes #1933
2015-11-24 11:38:10 +00:00
Rich Brennan
ce57281f6a Move content_panels inside FormPage definition. 2015-11-24 10:36:30 +00:00
Rich Brennan
010838b53e Add Orderable to list of imported wagtailcore models 2015-11-24 10:36:02 +00:00
Rich Brennan
fab4e2224f Move content_panels inside BookPage definition. 2015-11-24 10:36:02 +00:00
Dave Cranwell
29753ecb0d updated css guidelines. removed duplicate linting block 2015-11-24 00:05:31 +00:00
Dave Cranwell
dc7b9a90a1 linting upstream changes inherited from rebased onto master 2015-11-23 22:11:01 +00:00
Dave Cranwell
5d43512c38 fixing rebase confusion 2015-11-23 21:39:56 +00:00
Dave Cranwell
7e40b131e8 finished linting 2015-11-23 21:39:56 +00:00
Dave Cranwell
9b14b4bbb3 tweaked scss linting rules making them admittedly less stringent, but striking a better balance with realism 2015-11-23 21:39:55 +00:00
Dave Cranwell
e7993c4354 fixed SingleLinePerSelector 2015-11-23 21:39:55 +00:00
Dave Cranwell
04f760bd08 space indenting 2015-11-23 21:39:55 +00:00
Dave Cranwell
fc980bd103 updated npm packages. ongoing linting of scss files 2015-11-23 21:39:54 +00:00
Dave Cranwell
0cec363a4d SpaceAfterPropertyColon and SpaceBeforeBrace fixed in other apps 2015-11-23 21:39:54 +00:00
Dave Cranwell
17f96fe3b0 SpaceAfterPropertyColon and SpaceBeforeBrace fixed 2015-11-23 21:39:54 +00:00
Karl Hobley
059fc15b9d Added note about Elasticsearch 2.x 2015-11-20 12:50:31 +00:00
Tom Dyson
f41658cd05 Fix typo in external link chooser
"URL" is an acroynm
2015-11-20 12:39:30 +00:00
Matt Westcott
be3c557f15 Add Rich Brennan to contributors 2015-11-20 12:37:22 +00:00
Matt Westcott
4cd6a7130a Merge pull request #1944 from richbrennan/master
Move content_panels inside BlogPage definition.
2015-11-19 17:32:10 +00:00
Rich Brennan
2ad3985d67 Move content_panels inside BlogPage definition. 2015-11-19 17:16:02 +00:00
Karl Hobley
3f18768a36 Always run Elasticsearch tests that don't depend on a running instance
We now only skip tests that actually require a running Elasticsearch instance.

This also greatly cleans up the elasticsearch test suite.
2015-11-19 16:23:47 +00:00
Karl Hobley
3b2e54bc7c Make elasticsearch-py a dev requirement
The Elasticsearch tests now depend on an environment variable being set so we can safely install elasticsearch-py without Wagtail automatically assuming Elasticsearch is installed and running the tests.

This makes developer setup slightly easier, but also opens up the possibility for running some of the ES tests that don't depend on a running ES instance.
2015-11-19 16:23:47 +00:00
Karl Hobley
83d3aaeb2f Added --elasticsearch flag to travis/tox configuration 2015-11-19 16:23:24 +00:00
Matt Westcott
5dc0b37874 Move pure tree-related methods of PageQuerySet into a separate TreeQuerySet class
This allows them to be re-used on other treebeard.mp_tree-based models.
2015-11-19 15:38:30 +00:00