scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-09-12 16:14:58 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix Ajax calls with redirect [SCI-1837]

Browse source
This commit is contained in:
Oleksii Kriuchykhin 2017-11-29 16:13:28 +01:00
parent e740e586e8
commit 7bb52191cd
4 changed files with 45 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/my_module_tags_controller.rb
View file

@ -46,7 +46,7 @@ class MyModuleTagsController < ApplicationController
respond_to do |format|
format.json do
redirect_to my_module_tags_edit_path(format: :json),
redirect_to my_module_tags_edit_path(format: :json), turbolinks: false,
status: 303
end
end
@ -58,7 +58,7 @@ class MyModuleTagsController < ApplicationController
respond_to do |format|
format.json do
redirect_to my_module_tags_edit_path(format: :json),
redirect_to my_module_tags_edit_path(format: :json), turbolinks: false,
status: 303
end
end

48
app/controllers/tags_controller.rb
View file

@ -35,9 +35,13 @@ class TagsController < ApplicationController
flash[:success] = flash_success
redirect_to session.delete(:return_to)
}
format.json {
redirect_to my_module_tags_edit_path(params[:my_module_id], @tag, format: :json), :status => 303
}
format.json do
redirect_to my_module_tags_edit_path(params[:my_module_id],
@tag,
format: :json),
turbolinks: false,
status: 303
end
end
else
flash_error = t("tags.create.error_flash")
@ -46,10 +50,14 @@ class TagsController < ApplicationController
flash[:error] = flash_error
render :new
}
format.json {
format.json do
# TODO
redirect_to my_module_tags_edit_path(params[:my_module_id], @tag, format: :json), :status => 303
}
redirect_to my_module_tags_edit_path(params[:my_module_id],
@tag,
format: :json),
turbolinks: false,
status: 303
end
end
end
end
@ -59,9 +67,13 @@ class TagsController < ApplicationController
if @tag.update_attributes(tag_params)
respond_to do |format|
format.html
format.json {
redirect_to my_module_tags_edit_path(params[:my_module_id], @tag, format: :json), :status => 303
}
format.json do
redirect_to my_module_tags_edit_path(params[:my_module_id],
@tag,
format: :json),
turbolinks: false,
status: 303
end
end
else
respond_to do |format|
@ -84,9 +96,13 @@ class TagsController < ApplicationController
flash[:success] = flash_success
redirect_to root_path
}
format.json {
redirect_to my_module_tags_edit_path(params[:my_module_id], @tag, format: :json), :status => 303
}
format.json do
redirect_to my_module_tags_edit_path(params[:my_module_id],
@tag,
format: :json),
turbolinks: false,
status: 303
end
end
else
flash_error = t(
@ -98,10 +114,12 @@ class TagsController < ApplicationController
flash[:error] = flash_error
redirect_to root_path
}
format.json {
format.json do
# TODO
redirect_to my_module_tags_edit_path(format: :json), :status => 303
}
redirect_to my_module_tags_edit_path(format: :json),
turbolinks: false,
status: 303
end
end
end
end

8
app/controllers/user_my_modules_controller.rb
View file

@ -94,9 +94,11 @@ class UserMyModulesController < ApplicationController
)
respond_to do |format|
format.json {
redirect_to my_module_users_edit_path(format: :json), :status => 303
}
format.json do
redirect_to my_module_users_edit_path(format: :json),
turbolinks: false,
status: 303
end
end
else
respond_to do |format|

8
app/controllers/user_projects_controller.rb
View file

@ -145,9 +145,11 @@ class UserProjectsController < ApplicationController
generate_notification(current_user, @up.user, false, false, @project)
respond_to do |format|
format.json {
redirect_to project_users_edit_path(format: :json), :status => 303
}
format.json do
redirect_to project_users_edit_path(format: :json),
turbolinks: false,
status: 303
end
end
else
respond_to do |format|