Merge pull request #473 from latis-sw/feature/fix-blank-whodunnits

Make a new concern to handle the version user
UMN-LATIS · Aug 17, 2017 · 8782e8e · 8782e8e
2 parents 046adad + 3f578a6
commit 8782e8e
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/app/models/concerns/version_user.rb b/app/models/concerns/version_user.rb
@@ -0,0 +1,9 @@
+module VersionUser
+  extend ActiveSupport::Concern
+
+  module ClassMethods
+    def version_user(version)
+      version.whodunnit.nil? ? 'N/A' : User.find(version.whodunnit).internet_id
+    end
+  end
+end
diff --git a/app/models/group.rb b/app/models/group.rb
@@ -10,6 +10,7 @@
 #
 # models/group.rb
 class Group < ApplicationRecord
+  include VersionUser
   has_paper_trail
   after_save :version_history
   before_destroy :version_history
@@ -65,7 +66,7 @@ def version_history
     self.versions.each do |v|
       g = v.reify unless v.event.equal? "create"
       h.concat "<b>What Happened: </b> #{v.event} <br/>"
-      h.concat "<b>Who Made It: </b>  #{User.find(v.whodunnit).internet_id}<br/>"
+      h.concat "<b>Who Made It: </b>  #{self.class.version_user(v)}<br/>"
       h.concat "<b>Previous Name: </b>  #{g ? g.name : 'N/A'}<br/>"
       h.concat "<b>Previous Description: </b>  #{g ? g.description : 'N/A'}<br/>"
       h.concat "<b>Date of Change: </b>  #{g ? g.updated_at : 'N/A'}<br/>"

diff --git a/app/models/transfer_request.rb b/app/models/transfer_request.rb
@@ -12,6 +12,7 @@
 #
 
 class TransferRequest < ApplicationRecord
+  include VersionUser
   has_paper_trail
   after_save :version_history
   before_destroy :version_history
@@ -81,7 +82,7 @@ def version_history
     self.versions.each do |v|
       g = v.reify #unless v.event.equal? "create"
       h.concat "<b>What Happened: </b> #{v.event} <br/>"
-      h.concat "<b>Who Made It: </b>  #{User.find(v.whodunnit).internet_id}<br/>"
+      h.concat "<b>Who Made It: </b>  #{self.class.version_user(v)}<br/>"
       h.concat "<b>Previous Status: </b>  #{g ? g.status : 'N/A'}<br/>"
       h.concat "<br/><br/>"
     end

diff --git a/app/models/url.rb b/app/models/url.rb
@@ -13,6 +13,7 @@
 #
 require 'uri'
 class Url < ApplicationRecord
+  include VersionUser
   has_paper_trail :ignore => [:total_clicks]
   after_save :version_history
   before_destroy :version_history
@@ -124,7 +125,7 @@ def version_history
     self.versions.each do |v|
       g = v.reify unless v.event.equal? "create"
       h.concat "<b>What Happened: </b> #{v.event} <br/>"
-      h.concat "<b>Who Made It: </b>  #{User.find(v.whodunnit).internet_id}<br/>"
+      h.concat "<b>Who Made It: </b>  #{self.class.version_user(v)}<br/>"
       h.concat "<b>Previous URL: </b>  #{g ? g.url : 'N/A'}<br/>"
       h.concat "<b>Previous Keyword: </b>  #{g ? g.keyword : 'N/A'}<br/>"
       h.concat "<b>Previous Group Name: </b>  #{g && g.group ? g.group.name : 'N/A(Group doesnt exist)'}<br/>"