From b455261a4b611e86d3f4072c5f62e6dbeaa582c6 Mon Sep 17 00:00:00 2001
From: jpl
Date: Mon, 31 Jul 2017 11:44:24 +0200
Subject: Refs #4187: updating routes#show table

---
 app/helpers/table_builder_helper.rb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'app/helpers/table_builder_helper.rb')

diff --git a/app/helpers/table_builder_helper.rb b/app/helpers/table_builder_helper.rb
index 897e842a8..375697bec 100644
--- a/app/helpers/table_builder_helper.rb
+++ b/app/helpers/table_builder_helper.rb
@@ -175,12 +175,11 @@ module TableBuilderHelper
     sort_on,
     sort_direction
   )
-    if !table_is_sortable
+
+    if !table_is_sortable || !column.sortable
       return column.header_label(collection_model)
     end
 
-    return column.name if !column.sortable
-
     direction =
       if column.key.to_s == sort_on && sort_direction == 'desc'
         'asc'
-- 
cgit v1.2.3