Fix app.
This commit is contained in:
+11
-13
@@ -90,14 +90,12 @@ module Precious
|
|||||||
show_page_or_file('Home')
|
show_page_or_file('Home')
|
||||||
end
|
end
|
||||||
|
|
||||||
# if path is omitted then extraction is necessary
|
# path is set to name if path is nil.
|
||||||
# name, path, version
|
# name, path, version
|
||||||
def wiki_page( name, path = nil, version = nil)
|
def wiki_page( name, path = nil, version = nil)
|
||||||
if path.nil?
|
path = name if path.nil?
|
||||||
path = name
|
name = extract_name(name)
|
||||||
name = extract_name(name)
|
path = extract_path(path)
|
||||||
path = extract_path(path)
|
|
||||||
end
|
|
||||||
|
|
||||||
wiki = wiki_new
|
wiki = wiki_new
|
||||||
|
|
||||||
@@ -140,7 +138,7 @@ module Precious
|
|||||||
end
|
end
|
||||||
|
|
||||||
post '/edit/*' do
|
post '/edit/*' do
|
||||||
wikip = wiki_page(CGI.unescape(params[:page]), sanitize_empty_params(params[:path]))
|
wikip = wiki_page(CGI.unescape(params[:page]), sanitize_empty_params(params[:path]))
|
||||||
path = wikip.path
|
path = wikip.path
|
||||||
wiki = wikip.wiki
|
wiki = wikip.wiki
|
||||||
page = wikip.page
|
page = wikip.page
|
||||||
@@ -171,9 +169,8 @@ module Precious
|
|||||||
end
|
end
|
||||||
|
|
||||||
get '/create/*' do
|
get '/create/*' do
|
||||||
splat = params[:splat].first
|
wikip = wiki_page(params[:splat].first)
|
||||||
wikip = wiki_page(extract_name(splat).to_url, extract_path(splat))
|
@name = wikip.name.to_url
|
||||||
@name = wikip.name
|
|
||||||
@path = wikip.path
|
@path = wikip.path
|
||||||
|
|
||||||
page = wikip.page
|
page = wikip.page
|
||||||
@@ -288,10 +285,11 @@ module Precious
|
|||||||
|
|
||||||
get %r{/(.+?)/([0-9a-f]{40})} do
|
get %r{/(.+?)/([0-9a-f]{40})} do
|
||||||
file_path = params[:captures][0]
|
file_path = params[:captures][0]
|
||||||
name = extract_name(file_path)
|
wikip = wiki_page(file_path)
|
||||||
path = extract_path(file_path)
|
name = wikip.name
|
||||||
|
path = wikip.path
|
||||||
version = params[:captures][1]
|
version = params[:captures][1]
|
||||||
if page = wiki_page(name, path, version).page
|
if page = wikip.page
|
||||||
@page = page
|
@page = page
|
||||||
@name = name
|
@name = name
|
||||||
@content = page.formatted_data
|
@content = page.formatted_data
|
||||||
|
|||||||
Reference in New Issue
Block a user