Merge pull request #1143 from astorije/patch-1
Fix compare page not accessible in no-edit mode. Resolves #1140.
This commit is contained in:
+12
-1
@@ -96,7 +96,6 @@ module Precious
|
|||||||
before do
|
before do
|
||||||
settings.wiki_options[:allow_editing] = settings.wiki_options.fetch(:allow_editing, true)
|
settings.wiki_options[:allow_editing] = settings.wiki_options.fetch(:allow_editing, true)
|
||||||
@allow_editing = settings.wiki_options[:allow_editing]
|
@allow_editing = settings.wiki_options[:allow_editing]
|
||||||
forbid unless @allow_editing || request.request_method == "GET"
|
|
||||||
Precious::App.set(:mustache, {:templates => settings.wiki_options[:template_dir]}) if settings.wiki_options[:template_dir]
|
Precious::App.set(:mustache, {:templates => settings.wiki_options[:template_dir]}) if settings.wiki_options[:template_dir]
|
||||||
@base_url = url('/', false).chomp('/')
|
@base_url = url('/', false).chomp('/')
|
||||||
@page_dir = settings.wiki_options[:page_file_dir].to_s
|
@page_dir = settings.wiki_options[:page_file_dir].to_s
|
||||||
@@ -173,6 +172,8 @@ module Precious
|
|||||||
end
|
end
|
||||||
|
|
||||||
post '/uploadFile' do
|
post '/uploadFile' do
|
||||||
|
forbid unless @allow_editing
|
||||||
|
|
||||||
wiki = wiki_new
|
wiki = wiki_new
|
||||||
|
|
||||||
unless wiki.allow_uploads
|
unless wiki.allow_uploads
|
||||||
@@ -235,6 +236,8 @@ module Precious
|
|||||||
end
|
end
|
||||||
|
|
||||||
post '/rename/*' do
|
post '/rename/*' do
|
||||||
|
forbid unless @allow_editing
|
||||||
|
|
||||||
wikip = wiki_page(params[:splat].first)
|
wikip = wiki_page(params[:splat].first)
|
||||||
halt 500 if wikip.nil?
|
halt 500 if wikip.nil?
|
||||||
wiki = wikip.wiki
|
wiki = wikip.wiki
|
||||||
@@ -271,6 +274,8 @@ module Precious
|
|||||||
end
|
end
|
||||||
|
|
||||||
post '/edit/*' do
|
post '/edit/*' do
|
||||||
|
forbid unless @allow_editing
|
||||||
|
|
||||||
path = '/' + clean_url(sanitize_empty_params(params[:path])).to_s
|
path = '/' + clean_url(sanitize_empty_params(params[:path])).to_s
|
||||||
page_name = CGI.unescape(params[:page])
|
page_name = CGI.unescape(params[:page])
|
||||||
wiki = wiki_new
|
wiki = wiki_new
|
||||||
@@ -330,6 +335,8 @@ module Precious
|
|||||||
end
|
end
|
||||||
|
|
||||||
post '/create' do
|
post '/create' do
|
||||||
|
forbid unless @allow_editing
|
||||||
|
|
||||||
name = params[:page].to_url
|
name = params[:page].to_url
|
||||||
path = sanitize_empty_params(params[:path]) || ''
|
path = sanitize_empty_params(params[:path]) || ''
|
||||||
format = params[:format].intern
|
format = params[:format].intern
|
||||||
@@ -349,6 +356,8 @@ module Precious
|
|||||||
end
|
end
|
||||||
|
|
||||||
post '/revert/*/:sha1/:sha2' do
|
post '/revert/*/:sha1/:sha2' do
|
||||||
|
forbid unless @allow_editing
|
||||||
|
|
||||||
wikip = wiki_page(params[:splat].first)
|
wikip = wiki_page(params[:splat].first)
|
||||||
@path = wikip.path
|
@path = wikip.path
|
||||||
@name = wikip.name
|
@name = wikip.name
|
||||||
@@ -372,6 +381,8 @@ module Precious
|
|||||||
end
|
end
|
||||||
|
|
||||||
post '/preview' do
|
post '/preview' do
|
||||||
|
forbid unless @allow_editing
|
||||||
|
|
||||||
wiki = wiki_new
|
wiki = wiki_new
|
||||||
@name = params[:page] || "Preview"
|
@name = params[:page] || "Preview"
|
||||||
@page = wiki.preview_page(@name, params[:content], params[:format])
|
@page = wiki.preview_page(@name, params[:content], params[:format])
|
||||||
|
|||||||
Reference in New Issue
Block a user