fix visibility of date cf

frywer · Aug 22, 2019 · 720dafa · 720dafa
1 parent 768b54e
commit 720dafa
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/models/custom_entity.rb b/app/models/custom_entity.rb
@@ -33,7 +33,7 @@ def editable?(user = User.current)
   end
 
   def visible?(user = User.current)
-    user.allowed_to?(:view_and_manage_entities, nil, true)
+    user.allowed_to?(:view_and_manage_entities, nil, global: true)
   end
 
   def deletable?(user = nil)

diff --git a/app/views/custom_tables/_query_form.html.erb b/app/views/custom_tables/_query_form.html.erb
@@ -40,7 +40,7 @@
 
             <tr class="cusotm-entity-<%= cycle("odd", "even") %> hascontextmenu">
               <td class="checkbox hide-when-print"><%= check_box_tag("ids[]", entity.id, false, id: nil) %></td>
-              <%= raw query.inline_columns.map {|column| "<td class=\"#{column.css_classes}\">#{render_custom_table_content(column, entity)}</td>"}.join %>
+              <%= raw query.inline_columns.map {|column| "<td class=\"#{column.css_classes}\">#{column_content(column, entity)}</td>"}.join %>
               <td class="buttons">
                     <%= link_to l(:button_show), custom_entity_path(entity), title: l(:button_show), class: 'icon-only icon-magnifier' %>
                     <%= link_to l(:button_edit), edit_custom_entity_path(entity, edit_query: true, back_url: back_url), remote: true, title: l(:button_edit), class: 'icon-only icon-edit' %>