app/views/effective/logs/_log.html.haml in effective_logging-3.1.0 vs app/views/effective/logs/_log.html.haml in effective_logging-3.1.1

@@ -6,31 +6,36 @@
           = link_to(log.message, request.fullpath.sub('/' + log.to_param, '/' + parent.to_param))
           = ' > '
         %p= log.message.to_s.gsub("\n", '<br>').html_safe
 
       .col-md-4.text-right
-        - if log.prev_log
-          = link_to 'Prev', request.fullpath.sub('/' + log.to_param, '/' + log.prev_log.to_param), class: 'btn btn-primary'
+        - prev_log = log.prev_log
+        - next_log = log.next_log
 
-        - if log.next_log
-          = link_to 'Next', request.fullpath.sub('/' + log.to_param, '/' + log.next_log.to_param), class: 'btn btn-primary'
+        - if prev_log.present?
+          = link_to 'Prev', request.fullpath.sub('/' + log.to_param, '/' + prev_log.to_param), class: 'btn btn-primary'
 
+        - if next_log.present?
+          = link_to 'Next', request.fullpath.sub('/' + log.to_param, '/' + next_log.to_param), class: 'btn btn-primary'
+
   .panel-body.card-body
     .row
       .col-md-6
         %p
           - status_class = bootstrap_class_for_status(log.status)
-          %span{:class => (defined?(EffectiveBootstrap) ? "badge badge-#{status_class}" : "label label-#{status_class}")}= log.status
+          %span{class: (defined?(EffectiveBootstrap) ? "badge badge-#{status_class}" : "label label-#{status_class}")}= log.status
+
           = log.created_at.strftime("%F %H:%M:%S")
           = '(' + time_ago_in_words(log.created_at) + ' ago)'
 
       .col-md-6
         - if log.user.present?
           %p
             %strong User:
             = (log.user.to_s.starts_with?('#<User:0x') ? (log.user.email rescue log.user) : log.user)
-        - if (log.associated.present? rescue false)
+
+        - if log.associated_id.present? && log.associated_type.present? && (log.associated.present? rescue false)
           %p
             %strong Associated:
             - if log.associated.to_s.starts_with?('#<')
               = "#{log.associated.class.name} ##{log.associated.to_param}"
             - else
@@ -45,8 +50,6 @@
           = format_log_details_value(log, key)
 
     - if log.logs.present?
       %hr
       %p This log contains #{log.logs_count} additional sub entries:
-
-      - unless log.datatable.nil?
-        = render_datatable(log.datatable)
+      = render_datatable(log.child_logs_datatable)