lib/trestle/table/column.rb in trestle-0.8.4 vs lib/trestle/table/column.rb in trestle-0.8.5

@@ -29,12 +29,12 @@
       end
 
       def header
         if options[:header]
           options[:header]
-        elsif admin = table.options[:admin]
-          admin.human_attribute_name(field)
+        elsif table.admin
+          table.admin.human_attribute_name(field)
         else
           field.to_s.humanize.titleize
         end
       end
 
@@ -60,10 +60,10 @@
           if value.respond_to?(:id) && options[:link] != false
             # Automatically link to instance's admin if available
             content = @template.admin_link_to(content, value)
           elsif options[:link]
             # Explicitly link to the specified admin, or the table's admin
-            content = @template.admin_link_to(content, instance, admin: options[:admin] || @column.table.options[:admin])
+            content = @template.admin_link_to(content, instance, admin: options[:admin] || @column.table.admin)
           end
 
           content
         end