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

Fixed problems in interacting of acts_as_versioned and optimistic locking.

Browse source
This commit is contained in:
Benjamin Meichsner 2009-05-20 15:26:53 +02:00
parent 2660d86b89
commit 255a4cd6c7
5 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/views/pages/show.html.haml
View file

@ -7,10 +7,9 @@
%ul
- for version in @page.versions.reverse
%li
= link_to format_time(version.updated_at), version_page_path(@page, :version => version.version)
= link_to format_datetime(version.updated_at), version_page_path(@page, :version => version.lock_version)
= "(#{User.find(version.updated_by).nick})"
= render :partial => 'body'
%hr.clear/
@ -19,4 +18,4 @@
|
= link_to "Seite löschen", @page, :method => :delete, :confirm => "Achtung, möchtest Du wirklich die Wikiseite löschen?"
|
= "Zuletzt bearbeitet: #{format_datetime @page.updated_at} (#{@page.user.nick})"
= "Zuletzt bearbeitet am #{format_datetime @page.updated_at} (#{@page.user.nick})"

2
app/views/pages/version.html.haml
View file

@ -5,7 +5,7 @@
%ul
%li= "Autor: #{User.find(@version.updated_by).nick}"
%li= link_to "Aktuelle Version sehen", wiki_page_path(:permalink => @page.permalink)
%li= link_to "Auf diese Version zurücksetzen", revert_page_path(@page, :version => @version.version)
%li= link_to "Auf diese Version zurücksetzen", revert_page_path(@page, :version => @version.lock_version)
= wikified_body @version.body