diff --git a/app/controllers/wiki_pages_controller.rb b/app/controllers/wiki_pages_controller.rb
index 4213af585..ad9006c5e 100644
--- a/app/controllers/wiki_pages_controller.rb
+++ b/app/controllers/wiki_pages_controller.rb
@@ -57,6 +57,7 @@ class WikiPagesController < ApplicationController
@wiki_page = WikiPage.find(params[:id])
@version = WikiPageVersion.find(params[:version_id])
@wiki_page.revert_to!(@version)
+ flash[:notice] = "Page was reverted"
respond_with(@wiki_page)
end
diff --git a/app/views/wiki_page_versions/index.html.erb b/app/views/wiki_page_versions/index.html.erb
index f26d95118..8e7c69d56 100644
--- a/app/views/wiki_page_versions/index.html.erb
+++ b/app/views/wiki_page_versions/index.html.erb
@@ -11,7 +11,8 @@
|
|
- Title |
+ Title |
+ |
IP Address |
Last edited |
@@ -29,14 +30,15 @@
<%= radio_button_tag "otherpage", wiki_page_version.id %>
<% end %>
- <%= link_to wiki_page_version.title, wiki_page_path(wiki_page_version.wiki_page_id) %> |
+ <%= link_to wiki_page_version.title, wiki_page_version_path(wiki_page_version) %> |
+ <%= link_to "wiki", wiki_page_path(wiki_page_version.wiki_page_id) %> |
<% if CurrentUser.is_admin? %>
<%= wiki_page_version.updater_ip_addr %>
<% end %>
|
- <%= link_to wiki_page_version.updated_at.strftime("%Y-%m-%d %I:%M"), wiki_page_version_path(wiki_page_version) %>
+ <%= compact_time(wiki_page_version.updated_at) %>
<% if wiki_page_version.updater %>
by
<%= link_to wiki_page_version.updater_name, user_path(wiki_page_version.updater) %>
diff --git a/app/views/wiki_page_versions/show.html.erb b/app/views/wiki_page_versions/show.html.erb
index b8fdb58be..c16404141 100644
--- a/app/views/wiki_page_versions/show.html.erb
+++ b/app/views/wiki_page_versions/show.html.erb
@@ -8,6 +8,8 @@
<%= format_text(@wiki_page_version.body) %>
+
+ <%= link_to "Revert to this version", revert_wiki_page_path(@wiki_page_version.wiki_page_id, :version_id => @wiki_page_version.id), :method => :put %>
|