The last approver in the CSV export #691

app/controllers/dmsf_controller.rb

@@ -601,7 +601,7 @@ class DmsfController < ApplicationController
     @file_approval_allowed = User.current.allowed_to?(:file_approval, @project)
     tag = params[:custom_field_id].present? && params[:custom_value].present?
     @folder = nil if tag
-    @extra_columns = [l(:field_project), l(:label_document_url), l(:label_last_revision_id)]
+    @extra_columns = [l(:label_last_approver), l(:field_project), l(:label_document_url), l(:label_last_revision_id)]
     if @tree_view
       @locked_for_user = false
     else

app/models/dmsf_file.rb

@@ -583,6 +583,14 @@ class DmsfFile < ActiveRecord::Base
         csv << ''
       end
     end
+    # Last approver
+    if columns.include?(l(:label_last_approver))
+      if self.last_revision && self.last_revision.dmsf_workflow
+        csv << self.last_revision.workflow_tooltip
+      else
+        csv << ''
+      end
+    end
     # Url
     if columns.include?(l(:label_document_url))
       default_url_options[:host] = Setting.host_name

app/models/dmsf_folder.rb

@@ -450,6 +450,8 @@ class DmsfFolder < ActiveRecord::Base
     csv << '' if columns.include?('workflow')
     # Author
     csv << self.user.name if columns.include?('author')
+    # Last approver
+    csv << '' if columns.include?(l(:label_last_approver))
     # Url
     if columns.include?(l(:label_document_url))
       default_url_options[:host] = Setting.host_name

app/models/dmsf_link.rb

@@ -171,6 +171,8 @@ class DmsfLink < ActiveRecord::Base
       csv << '' if columns.include?('workflow')
       # Author
       csv << self.user.name if columns.include?('author')
+      # Last approver
+      csv << '' if columns.include?(l(:label_last_approver))
       # Url
       csv << self.external_url if columns.include?(l(:label_document_url))
       # Revision

config/locales/cs.yml

@@ -359,3 +359,5 @@ cs:
   
   label_webdav_use_project_names: Použít názvy projektů
   note_webdav_use_project_names: Použít názvy projektů místo identifikátorů pro názvy adresářů.
+
+  label_last_approver: Poslední schvalovatel

config/locales/de.yml

@@ -356,3 +356,5 @@ de:
   
   label_webdav_use_project_names: Use project name for project folder
   note_webdav_use_project_names: Use project names instead of project identifier for project folders.
+
+  label_last_approver: Last approver

config/locales/en.yml

@@ -359,3 +359,5 @@ en:
   
   label_webdav_use_project_names: Use project name for project folder
   note_webdav_use_project_names: Use project names instead of project identifier for project folders.
+
+  label_last_approver: Last approver

config/locales/es.yml

@@ -359,3 +359,5 @@ es:
   
   label_webdav_use_project_names: Use project name for project folder
   note_webdav_use_project_names: Use project names instead of project identifier for project folders.
+
+  label_last_approver: Last approver

config/locales/fr.yml

@@ -359,3 +359,5 @@ fr:
   
   label_webdav_use_project_names: Use project name for project folder
   note_webdav_use_project_names: Use project names instead of project identifier for project folders.
+
+  label_last_approver: Last approver

config/locales/it.yml

@@ -359,3 +359,5 @@ it: # Italian strings thx 2 Matteo Arceci!
   
   label_webdav_use_project_names: Use project name for project folder
   note_webdav_use_project_names: Use project names instead of project identifier for project folders.
+
+  label_last_approver: Last approver

config/locales/ja.yml

@@ -359,3 +359,5 @@ ja:
   
   label_webdav_use_project_names: Use project name for project folder
   note_webdav_use_project_names: Use project names instead of project identifier for project folders.
+
+  label_last_approver: Last approver

config/locales/pl.yml

@@ -359,3 +359,5 @@ pl:
   
   label_webdav_use_project_names: Use project name for project folder
   note_webdav_use_project_names: Use project names instead of project identifier for project folders.
+
+  label_last_approver: Last approver

config/locales/pt-BR.yml

@@ -359,3 +359,5 @@ pt-BR:
   
   label_webdav_use_project_names: Use project name for project folder
   note_webdav_use_project_names: Use project names instead of project identifier for project folders.
+
+  label_last_approver: Last approver

config/locales/ru.yml

@@ -359,3 +359,5 @@ ru:
   
   label_webdav_use_project_names: Use project name for project folder
   note_webdav_use_project_names: Use project names instead of project identifier for project folders.
+
+  label_last_approver: Last approver

config/locales/sl.yml

@@ -359,3 +359,5 @@ sl:
   
   label_webdav_use_project_names: Use project name for project folder
   note_webdav_use_project_names: Use project names instead of project identifier for project folders.
+
+  label_last_approver: Last approver

config/locales/zh-TW.yml

@@ -359,3 +359,5 @@ zh-TW:
   
   label_webdav_use_project_names: Use project name for project folder
   note_webdav_use_project_names: Use project names instead of project identifier for project folders.
+
+  label_last_approver: Last approver

config/locales/zh.yml

@@ -359,3 +359,5 @@ zh:
   
   label_webdav_use_project_names: Use project name for project folder
   note_webdav_use_project_names: Use project names instead of project identifier for project folders.
+
+  label_last_approver: Last approver