Fix "mark as translated" removing url params
This commit is contained in:
@@ -52,26 +52,7 @@ class PostsController < ApplicationController
|
|||||||
@post.update_attributes(params[:post], :as => CurrentUser.role)
|
@post.update_attributes(params[:post], :as => CurrentUser.role)
|
||||||
end
|
end
|
||||||
|
|
||||||
respond_with(@post) do |format|
|
respond_with_post_after_update(@post)
|
||||||
format.html do
|
|
||||||
if @post.errors.any?
|
|
||||||
@error_message = @post.errors.full_messages.join("; ")
|
|
||||||
render :template => "static/error", :status => 500
|
|
||||||
elsif params[:tags_query].present? && params[:pool_id].present?
|
|
||||||
redirect_to post_path(@post, :tags => params[:tags_query], :pool_id => params[:pool_id])
|
|
||||||
elsif params[:tags_query].present?
|
|
||||||
redirect_to post_path(@post, :tags => params[:tags_query])
|
|
||||||
elsif params[:pool_id].present?
|
|
||||||
redirect_to post_path(@post, :pool_id => params[:pool_id])
|
|
||||||
else
|
|
||||||
redirect_to post_path(@post)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
format.json do
|
|
||||||
render :json => @post.to_json
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def revert
|
def revert
|
||||||
@@ -125,7 +106,7 @@ class PostsController < ApplicationController
|
|||||||
def mark_as_translated
|
def mark_as_translated
|
||||||
@post = Post.find(params[:id])
|
@post = Post.find(params[:id])
|
||||||
@post.mark_as_translated(params[:post])
|
@post.mark_as_translated(params[:post])
|
||||||
respond_with(@post)
|
respond_with_post_after_update(@post)
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
@@ -141,4 +122,27 @@ private
|
|||||||
cookies[:recent_tags_with_categories] = Tag.categories_for(tags).to_a.flatten.join(" ")
|
cookies[:recent_tags_with_categories] = Tag.categories_for(tags).to_a.flatten.join(" ")
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def respond_with_post_after_update(post)
|
||||||
|
respond_with(post) do |format|
|
||||||
|
format.html do
|
||||||
|
if post.errors.any?
|
||||||
|
@error_message = post.errors.full_messages.join("; ")
|
||||||
|
render :template => "static/error", :status => 500
|
||||||
|
elsif params[:tags_query].present? && params[:pool_id].present?
|
||||||
|
redirect_to post_path(post, :tags => params[:tags_query], :pool_id => params[:pool_id])
|
||||||
|
elsif params[:tags_query].present?
|
||||||
|
redirect_to post_path(post, :tags => params[:tags_query])
|
||||||
|
elsif params[:pool_id].present?
|
||||||
|
redirect_to post_path(post, :pool_id => params[:pool_id])
|
||||||
|
else
|
||||||
|
redirect_to post_path(post)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
format.json do
|
||||||
|
render :json => post.to_json
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -49,6 +49,9 @@
|
|||||||
|
|
||||||
<section id="mark-as-translated-section" style="display: none;">
|
<section id="mark-as-translated-section" style="display: none;">
|
||||||
<%= form_tag(mark_as_translated_post_path(@post), :class => "simple_form", :method => :put) do |f| %>
|
<%= form_tag(mark_as_translated_post_path(@post), :class => "simple_form", :method => :put) do |f| %>
|
||||||
|
<%= hidden_field_tag :tags_query, params[:tags] %>
|
||||||
|
<%= hidden_field_tag :pool_id, params[:pool_id] %>
|
||||||
|
|
||||||
<fieldset>
|
<fieldset>
|
||||||
<label for="post_check_translation">
|
<label for="post_check_translation">
|
||||||
<%= check_box "post", "check_translation", :checked => @post.has_tag?("check_translation") %>
|
<%= check_box "post", "check_translation", :checked => @post.has_tag?("check_translation") %>
|
||||||
|
|||||||
Reference in New Issue
Block a user