0
0
mirror of https://github.com/wagtail/wagtail.git synced 2024-12-01 11:41:20 +01:00
Commit Graph

4631 Commits

Author SHA1 Message Date
Karl Hobley
cebe5249d0 Changelog/release notes for #1606 2015-08-17 12:16:32 +01:00
Karl Hobley
f259ce4dfc Merge pull request #1618 from marctc/patch-1
Fixed indentation problems
2015-08-17 11:52:50 +01:00
Marc
3b651241ae Fixed indentation problems
The original indentation used was 2 spaces. Fixed to 4 spaces.
2015-08-17 12:49:54 +02:00
Karl Hobley
8eaf25e3e9 Merge pull request #1606 from gasman/fix/permission-consistency
Fix various inconsistencies in our permissions model
2015-08-17 11:48:58 +01:00
Matt Westcott
8c583e68d8 decorate wrapper functions with functools.wraps 2015-08-15 16:51:55 +02:00
Matt Westcott
a8e7200b1a use triple-quoted string for docstring 2015-08-15 16:46:37 +02:00
Matt Westcott
f8e08929eb Remove unused import of ContentType 2015-08-15 02:39:31 +02:00
Matt Westcott
164013bd43 When registering user/group permissions, specify add/change/delete permissions explicitly.
This ensures that we don't pull in any other permissions that may happen to exist (but are not relevant to the Wagtail admin). Also, ensure that we pick up the appropriate user model as returned by get_user_model, as this is the one used for permission checks in the views.
2015-08-15 02:39:31 +02:00
Matt Westcott
45e3354a44 Check add/change/delete permissions as appropriate within user admin UI
...instead of using change_user for everything
2015-08-15 02:39:30 +02:00
Matt Westcott
e1f4b9a68c Show groups menu item iff user has add, change or delete permission on groups (rather than checking 'auth' permissions en masse) 2015-08-15 02:39:30 +02:00
Matt Westcott
90b009583e Convert remaining permission_required decorators to the wagtailadmin one 2015-08-15 02:39:30 +02:00
Matt Westcott
2c948bbe15 Remove redundant access_admin permission check from styleguide.
All admin views added through register_admin_urls have this applied automatically.
2015-08-15 02:39:30 +02:00
Matt Westcott
7d32c55d7f Add a permission_required decorator as a non-broken replacement for Django's one.
This is functionally equivalent to any_permission_required with a single permission passed, but it's better to make permission_required its own thing so that developers don't have the mental hurdle of seeing an unfamiliar decorator and wondering what 'any' refers to...
2015-08-15 02:39:30 +02:00
Matt Westcott
b3a55a3588 Make documents admin usable by users who have change_document permission but not add_document 2015-08-15 02:39:30 +02:00
Matt Westcott
169eb8a85c Make images admin usable by users who have change_image permission but not add_image 2015-08-15 02:39:29 +02:00
Matt Westcott
04b95ce99e Remove 'delete' permission checkboxes for image and document.
For these models, permission to edit implies permission to delete, so the delete permission is redundant.
2015-08-15 02:39:29 +02:00
Matt Westcott
d11f8efc80 Remove 'user profile' from the set of registered permission types.
This is never used, as Wagtail has no interface for editing user profiles; if one were to exist, it would make more sense for this to be linked to User permissions.
2015-08-15 02:39:29 +02:00
Matt Westcott
371c9dc9a5 Merge branch 'kaedroho-fetch-translations' 2015-08-14 13:11:26 +02:00
Karl Hobley
ce743768f5 Fetched translations from transfex 2015-08-14 10:58:35 +01:00
Matt Westcott
a1886d4d5b fix another styleguide link missed when converting to namespaced URLs 2015-08-14 11:44:06 +02: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
Karl Hobley
337a979257 #1582 - Fix typo in model reference 2015-08-05 14:13:00 +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
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
fd821179cd Merge pull request #1580 from benebun/patch-1
Fix typo templage > template
2015-08-03 14:38:10 +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
Matt Westcott
943310d097 add forgotten changelog items 2015-08-01 11:20:21 +02:00
Matt Westcott
0964a7f6b6 Merge pull request #1492 from kaedroho/es-index-chunked-rebuild
Rebuild search indices in chunks
2015-08-01 11:16:57 +02:00
Matt Westcott
f51412e764 Merge branch 'kaedroho-es-index-atomic-rebuild' 2015-08-01 11:14:08 +02:00
Matt Westcott
bd59ee93b6 Release note for #1490 2015-08-01 11:13:46 +02:00
Matt Westcott
55c3606b16 Merge branch 'es-index-atomic-rebuild' of https://github.com/kaedroho/wagtail into kaedroho-es-index-atomic-rebuild 2015-08-01 10:52:20 +02:00
Matt Westcott
955f751965 Remove check for Wagtail-0.3-style urlconfs in wagtailimages 2015-08-01 00:01:08 +02:00