wiki.ohea.xyz/gollum
10
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Add delete this Page based on .com.

Browse Source 
Match short sha commit message of .com for edit and delete.
Update tests.
This commit is contained in:
bootstraponline
2012-07-21 15:33:43 -06:00
parent 77fb5ec3cb
commit e0b7009bff
6 changed files with 52 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/gollum/frontend/app.rb
+16 -3
View File
@@ -125,7 +125,9 @@ module Precious
wiki = Gollum::Wiki.new(settings.gollum_path, wiki_options)
page = wiki.page(CGI.unescape(params[:page]))
name = params[:rename] || page.name
committer = Gollum::Committer.new(wiki, commit_message)
msg = commit_message
msg[:message]= msg[:message] + " [#{page.version_short}]"
committer = Gollum::Committer.new(wiki, msg)
commit = {:committer => committer}
update_wiki_page(wiki, page, params[:content], commit, name, params[:format])
@@ -139,6 +141,17 @@ module Precious
redirect "/#{page.escaped_url_path}"
end
get '/delete/*' do
@path = extract_path(params[:splat].first)
@name = extract_name(params[:splat].first).to_url
wiki_options = settings.wiki_options.merge({ :page_file_dir => @path })
wiki = Gollum::Wiki.new(settings.gollum_path, wiki_options)
@page = wiki.page(@name)
wiki.delete_page(@page, { :message => "Destroyed #{@name} (#{@page.format}) [#{@page.version_short}]" })
redirect '/'
end
get '/create/*' do
@path = extract_path(params[:splat].first)
@name = extract_name(params[:splat].first).to_url
@@ -331,13 +344,13 @@ module Precious
end
end
def update_wiki_page(wiki, page, content, commit_message, name = nil, format = nil)
def update_wiki_page(wiki, page, content, commit, name = nil, format = nil)
return if !page ||
((!content || page.raw_data == content) && page.format == format)
name ||= page.name
format = (format || page.format).to_sym
content ||= page.raw_data
wiki.update_page(page, name, format, content.to_s, commit_message)
wiki.update_page(page, name, format, content.to_s, commit)
end
def commit_message