Merge branch 'master' into 3618-column-ordering

[arvados.git] / apps / workbench / app / views / projects / _show_tab_contents.html.erb

diff --git a/apps/workbench/app/views/projects/_show_tab_contents.html.erb b/apps/workbench/app/views/projects/_show_tab_contents.html.erb
index 7254d9cf070db08b8aa22ec6c692a2bfa4569e27..af634bfa1240c6a2530c475305339b7a9f526987 100644 (file)
--- a/apps/workbench/app/views/projects/_show_tab_contents.html.erb
+++ b/apps/workbench/app/views/projects/_show_tab_contents.html.erb
@@ -85,10 +85,17 @@
         <th></th>
         <th></th>
         <% sort_order = sortable_columns['name'] %>
-        <th <%= raw sort_order.nil? ? "" : "data-sort-order='#{sort_order}'" %>>
+        <th <% if !sort_order.nil? %>
+              data-sort-order='<%= raw sort_order %>'
+            <% end %> >
           name
         </th>
-        <th>description</th>
+        <% sort_order = sortable_columns['description'] %>
+        <th <% if !sort_order.nil? %>
+              data-sort-order='<%= raw sort_order %>'
+            <% end %> >
+          description
+        </th>
       </tr>
     </thead>
   </table>