-
Notifications
You must be signed in to change notification settings - Fork 45
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Redirect back to edit page after using new creator/collection button #2677
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
005fb33
return to URL from session after creation
Floppy 7e4287a
rename return_to option
Floppy 6253f52
set return session param on model editing pages
Floppy f31c4fe
select new creator or collection in dropdown
Floppy 761e9af
DRY up tests to make linter happy
Floppy File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -52,7 +52,12 @@ def edit | |
def create | ||
authorize Creator | ||
@creator = Creator.create(creator_params) | ||
redirect_to creators_path, notice: t(".success") | ||
if session[:return_after_new] | ||
redirect_to session[:return_after_new] + "?new_creator=#{@creator.to_param}", notice: t(".success") | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Possible unprotected redirect |
||
session[:return_after_new] = nil | ||
else | ||
redirect_to creators_path, notice: t(".success") | ||
end | ||
end | ||
|
||
def update | ||
|
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -7,6 +7,8 @@ class ModelsController < ApplicationController | |
|
||
before_action :get_model, except: [:bulk_edit, :bulk_update, :index, :new, :create] | ||
before_action :get_creators_and_collections, only: [:new, :edit, :bulk_edit] | ||
before_action :set_returnable, only: [:bulk_edit, :edit, :new] | ||
before_action :clear_returnable, only: [:bulk_update, :update, :create] | ||
|
||
after_action :verify_policy_scoped, only: [:bulk_edit, :bulk_update] | ||
|
||
|
@@ -204,4 +206,18 @@ def get_creators_and_collections | |
@creators = policy_scope(Creator) | ||
@collections = policy_scope(Collection) | ||
end | ||
|
||
def set_returnable | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Method |
||
session[:return_after_new] = request.fullpath.split("?")[0] | ||
@new_collection = Collection.find_by(public_id: params[:new_collection]) if params[:new_collection] | ||
@new_creator = Creator.find_by(public_id: params[:new_creator]) if params[:new_creator] | ||
if @model | ||
@model.collection = @new_collection if @new_collection | ||
@model.collection = @new_creator if @new_creator | ||
end | ||
end | ||
|
||
def clear_returnable | ||
session[:return_after_new] = nil | ||
end | ||
end |
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
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
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
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Possible unprotected redirect