Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

Merge pull request #420 from foodcoop1040/wiki_diff

Browse source 
Add diff for wiki pages
This commit is contained in:
wvengen 2016-03-07 20:23:09 +01:00
commit a0358aab01
6 changed files with 34 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
plugins/wiki/app/controllers/pages_controller.rb
View file

@ -131,6 +131,13 @@ class PagesController < ApplicationController
end
end
def diff
@page = Page.find(params[:id])
@old_version = Page::Version.find_by_page_id_and_lock_version params[:id], params[:old]
@new_version = Page::Version.find_by_page_id_and_lock_version params[:id], params[:new]
@diff = Diffy::Diff.new(@old_version.body, @new_version.body).to_s(:html)
end
def version
@page = Page.find(params[:id])
@version = Page::Version.find_by_page_id_and_lock_version params[:id], params[:version]