cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Avoid using format as a URL parameter name

Browse source 
This prevents rails confusing it with the builtin format
parameter derived from the URL extension.
This commit is contained in:
Tom Hughes 2017-06-02 21:53:53 +01:00
parent 3b2d1886eb
commit 2357118c46
4 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/site_controller.rb
View file

@ -115,7 +115,7 @@ class SiteController < ApplicationController
def offline; end
def preview
render :html => RichText.new(params[:format], params[:text]).to_html
render :html => RichText.new(params[:type], params[:text]).to_html
end
def id

6
app/helpers/application_helper.rb
View file

@ -59,16 +59,16 @@ module ApplicationHelper
def richtext_area(object_name, method, options = {})
id = "#{object_name}_#{method}"
format = options.delete(:format) || "markdown"
type = options.delete(:format) || "markdown"
content_tag(:div, :id => "#{id}_container", :class => "richtext_container") do
output_buffer << content_tag(:div, :id => "#{id}_content", :class => "richtext_content") do
output_buffer << text_area(object_name, method, options.merge("data-preview-url" => preview_url(:format => format)))
output_buffer << text_area(object_name, method, options.merge("data-preview-url" => preview_url(:type => type)))
output_buffer << content_tag(:div, "", :id => "#{id}_preview", :class => "richtext_preview richtext")
end
output_buffer << content_tag(:div, :id => "#{id}_help", :class => "richtext_help") do
output_buffer << render("site/#{format}_help")
output_buffer << render("site/#{type}_help")
output_buffer << content_tag(:div, :class => "buttons") do
output_buffer << submit_tag(I18n.t("site.richtext_area.edit"), :id => "#{id}_doedit", :class => "richtext_doedit deemphasize", :disabled => true)
output_buffer << submit_tag(I18n.t("site.richtext_area.preview"), :id => "#{id}_dopreview", :class => "richtext_dopreview deemphasize")

2
config/routes.rb
View file

@ -184,7 +184,7 @@ OpenStreetMap::Application.routes.draw do
match "/go/:code" => "site#permalink", :via => :get, :code => /[a-zA-Z0-9_@~]+[=-]*/
# rich text preview
match "/preview/:format" => "site#preview", :via => :post, :as => :preview
match "/preview/:type" => "site#preview", :via => :post, :as => :preview
# traces
match "/user/:display_name/traces/tag/:tag/page/:page" => "trace#list", :via => :get, :page => /[1-9][0-9]*/

10
test/controllers/site_controller_test.rb
View file

@ -73,8 +73,8 @@ class SiteControllerTest < ActionController::TestCase
{ :controller => "site", :action => "permalink", :code => "shortcode" }
)
assert_routing(
{ :path => "/preview/formatname", :method => :post },
{ :controller => "site", :action => "preview", :format => "formatname" }
{ :path => "/preview/typename", :method => :post },
{ :controller => "site", :action => "preview", :type => "typename" }
)
assert_routing(
{ :path => "/id", :method => :get },
@ -365,13 +365,13 @@ class SiteControllerTest < ActionController::TestCase
# Test the rich text preview
def test_preview
xhr :post, :preview, :format => "html"
xhr :post, :preview, :type => "html"
assert_response :success
xhr :post, :preview, :format => "markdown"
xhr :post, :preview, :type => "markdown"
assert_response :success
xhr :post, :preview, :format => "text"
xhr :post, :preview, :type => "text"
assert_response :success
end