WIP: [Sitebuilder] Make snippets aware of multiple sites #35
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kaedroho
force-pushed
the
feature/sitebuilder-snippets
branch
2 times, most recently
from
2c573c0 to
5acb405
Compare
kaedroho
force-pushed
the
feature/sitebuilder-snippets
branch
from
5acb405 to
3c14a42
Compare
…depending on the host (site) from which the admin is being accessed
Parbhat
force-pushed
the
feature/sitebuilder-snippets
branch
from
3b30633 to
9199337
Compare
|
For the commit "Fix merge conflicts with master". I'm not sure what this is doing? Could you instead merge master into this branch to resolve conflicts? |
kaedroho
commented
Apr 27, 2018
| @@ -5,7 +5,7 @@ | |||
| <div class="nice-padding"> | |||
| {# Need to keep the form in the HTML, even if the snippet is not searchable #} | |||
| {# This is to allow pagination links to be generated from the form action URL #} | |||
| <form class="snippet-search search-bar" action="{% url 'wagtailsnippets:choose' model_opts.app_label model_opts.model_name site.id %}" method="GET" novalidate> | |||
| <form class="snippet-search search-bar" action="{% url 'wagtailsnippets:choose' site.id model_opts.app_label model_opts.model_name %}" method="GET" novalidate> | |||
There was a problem hiding this comment.
What's the reason for changing the order of these parameters?
There was a problem hiding this comment.
Ahh, I see it now. It makes it possible to insert the site id into the URL in wagtail_hooks.py
|
@kaedroho the commit message is somewhat misleading. The commit merge |
|
These changes look good to me |
|
@kaedroho Added a commit to add js file |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
https://projects.torchbox.com/projects/girl-effect-corporate-site/tickets/146
This PR implements site-based isolation into Wagtail's snippets module. All snippets are now associated with a site, and editors who have not got permission to edit pages in a site will no longer have permission to edit snippets for that site as well.
TODO: