From 58ecaca72e5e08283702898f5cd67e8a6d28f45c Mon Sep 17 00:00:00 2001
From: "karel.picman@lbcfree.net" <karel.picman@lbcfree.net>
Date: Wed, 30 Sep 2020 14:48:32 +0200
Subject: [PATCH] Available in CSV Internal Error #1175

---
 app/controllers/dmsf_controller.rb | 3 ++-
 app/models/dmsf_query.rb           | 2 +-
 app/views/dmsf/show.html.erb       | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/controllers/dmsf_controller.rb b/app/controllers/dmsf_controller.rb
index 84b08856..2dd387d9 100644
--- a/app/controllers/dmsf_controller.rb
+++ b/app/controllers/dmsf_controller.rb
@@ -80,7 +80,8 @@ class DmsfController < ApplicationController
           @offset, @limit = api_offset_and_limit
         }
         format.csv  {
-          send_data query_to_csv(@query.dmsf_nodes, @query), type: 'text/csv; header=present', filename: 'dmsf.csv'
+          send_data query_to_csv(@query.dmsf_nodes, @query), type: 'text/csv; header=present',
+                    filename: 'dmsf.csv'
         }
       end
     else
diff --git a/app/models/dmsf_query.rb b/app/models/dmsf_query.rb
index 0eb66686..582a0afd 100644
--- a/app/models/dmsf_query.rb
+++ b/app/models/dmsf_query.rb
@@ -29,7 +29,7 @@ class DmsfQuery < Query
 
   # Standard columns
   self.available_columns = [
-      QueryColumn.new(:id, sortable: 'id', caption: '#'),
+      QueryColumn.new(:id, sortable: 'id', caption: +'#'),
       DmsfTitleQueryColumn.new(:title, sortable: 'title', frozen: true),
       QueryColumn.new(:size, sortable: 'size'),
       DmsfModifiedQueryColumn.new(:modified, sortable: 'updated'),
diff --git a/app/views/dmsf/show.html.erb b/app/views/dmsf/show.html.erb
index cf4c8d23..67669b8e 100644
--- a/app/views/dmsf/show.html.erb
+++ b/app/views/dmsf/show.html.erb
@@ -82,7 +82,7 @@
 
 <% unless @folder && @folder.system %>
     <% other_formats_links do |f| %>
-      <%= f.link_to 'CSV', url: { action: :show, id: @project, folder_id: @folder } %>
+      <%= f.link_to 'CSV', url: { action: :show, id: @project, folder_id: @folder, encoding: Encoding::UTF_8 } %>
       <span>
         <%= link_to 'WebDAV', webdav_url(@project, @folder) %>
       </span>