Skip to content

Commit 2a80477

Browse files
committed
Add user_name method
1 parent a92cda3 commit 2a80477

File tree

5 files changed

+9
-14
lines changed

5 files changed

+9
-14
lines changed

app/controllers/entry_versions_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ class EntryVersionsController < ApplicationController
22
before_action :find_current_entry, only: [:index, :show]
33

44
def index
5-
@versions = @entry.versions.reverse_order.offset(1)
5+
@versions = @entry.versions.reverse_order
66
end
77

88
def show

app/models/entry.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
class Entry < ActiveRecord::Base
22
include Label
3-
has_paper_trail
3+
has_paper_trail class_name: 'EntryVersion'
44

55
ALLOWED_PARAMS = %i[namenskuerzel kennzahl
66
spaltenzahl japanische_umschrift

app/models/entry_version.rb

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
class EntryVersion < PaperTrail::Version
2+
def user_name
3+
User.find(self.whodunnit).name rescue nil
4+
end
5+
end

app/views/entry_versions/index.html.erb

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
<span><%= link_to "aktuelle version", entry_path(@entry) %></span>
21
<h1>Versions Index </h1>
32
<table class="table">
43
<tr>
@@ -10,10 +9,10 @@
109

1110
<% @versions.to_enum.with_index(1) do |version, index| %>
1211
<tr>
13-
<td><%= index %></td>
12+
<td><%= index == 1 ? 'Aktuelle Version' : index %></td>
1413
<td><%= "#{version.created_at.strftime('%b %d, %Y')}" %></td>
1514
<td><%= "#{version.user_name}" %></td>
16-
<td><%= link_to "Anzeigen", entry_version_path(version.item_id, version.id, {version_number: index}) %></td>
15+
<td><%= link_to "Anzeigen", index == 1 ? entry_path(@entry) : entry_version_path(version.item_id, version.id, {version_number: index}) %></td>
1716
</tr>
1817
<% end %>
1918
</table>

config/initializers/paper_trail.rb

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1 @@
1-
PaperTrail::Rails::Engine.eager_load!
21
PaperTrail.config.track_associations = false
3-
module PaperTrail
4-
class Version < ActiveRecord::Base
5-
def user_name
6-
# User.find self.whodunnit.to_i
7-
User.find(self.whodunnit).name rescue nil
8-
end
9-
end
10-
end

0 commit comments

Comments
 (0)