From 884164a31e25b29a0133c8d2e3a3e09cb449a7c3 Mon Sep 17 00:00:00 2001 From: Karel Picman Date: Fri, 10 Mar 2017 15:14:34 +0100 Subject: [PATCH] The last approver in the CSV export #691 --- app/controllers/dmsf_controller.rb | 2 +- app/models/dmsf_file.rb | 8 ++++++++ app/models/dmsf_folder.rb | 2 ++ app/models/dmsf_link.rb | 2 ++ config/locales/cs.yml | 2 ++ config/locales/de.yml | 2 ++ config/locales/en.yml | 2 ++ config/locales/es.yml | 2 ++ config/locales/fr.yml | 2 ++ config/locales/it.yml | 2 ++ config/locales/ja.yml | 2 ++ config/locales/pl.yml | 2 ++ config/locales/pt-BR.yml | 2 ++ config/locales/ru.yml | 2 ++ config/locales/sl.yml | 2 ++ config/locales/zh-TW.yml | 2 ++ config/locales/zh.yml | 2 ++ 17 files changed, 39 insertions(+), 1 deletion(-) diff --git a/app/controllers/dmsf_controller.rb b/app/controllers/dmsf_controller.rb index 79a25f20..e0529c9c 100644 --- a/app/controllers/dmsf_controller.rb +++ b/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 diff --git a/app/models/dmsf_file.rb b/app/models/dmsf_file.rb index 2db788f2..c9b85e90 100644 --- a/app/models/dmsf_file.rb +++ b/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 diff --git a/app/models/dmsf_folder.rb b/app/models/dmsf_folder.rb index 8445e54b..8d2875bd 100644 --- a/app/models/dmsf_folder.rb +++ b/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 diff --git a/app/models/dmsf_link.rb b/app/models/dmsf_link.rb index 3c815f0b..ee0c63a0 100644 --- a/app/models/dmsf_link.rb +++ b/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 diff --git a/config/locales/cs.yml b/config/locales/cs.yml index b8707c60..7bab3879 100644 --- a/config/locales/cs.yml +++ b/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 \ No newline at end of file diff --git a/config/locales/de.yml b/config/locales/de.yml index 3d9d029f..8e59a0bd 100644 --- a/config/locales/de.yml +++ b/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 \ No newline at end of file diff --git a/config/locales/en.yml b/config/locales/en.yml index 4f909279..4b0f547c 100644 --- a/config/locales/en.yml +++ b/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 \ No newline at end of file diff --git a/config/locales/es.yml b/config/locales/es.yml index 3194918b..69e6ff4e 100644 --- a/config/locales/es.yml +++ b/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 \ No newline at end of file diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 1e48b134..12d3fd97 100644 --- a/config/locales/fr.yml +++ b/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 \ No newline at end of file diff --git a/config/locales/it.yml b/config/locales/it.yml index 50b1e09d..78f43c16 100644 --- a/config/locales/it.yml +++ b/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 \ No newline at end of file diff --git a/config/locales/ja.yml b/config/locales/ja.yml index 4a97a71d..57262d3f 100644 --- a/config/locales/ja.yml +++ b/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 \ No newline at end of file diff --git a/config/locales/pl.yml b/config/locales/pl.yml index 2ee7d34d..e462dee6 100644 --- a/config/locales/pl.yml +++ b/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 \ No newline at end of file diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index e63bf12a..6fbccd45 100644 --- a/config/locales/pt-BR.yml +++ b/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 \ No newline at end of file diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 7fb2c19f..b4bee0b4 100644 --- a/config/locales/ru.yml +++ b/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 \ No newline at end of file diff --git a/config/locales/sl.yml b/config/locales/sl.yml index d7a10f6f..84d2e58e 100644 --- a/config/locales/sl.yml +++ b/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 \ No newline at end of file diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index 369c869e..361c17c9 100644 --- a/config/locales/zh-TW.yml +++ b/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 \ No newline at end of file diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 65aa5a9b..df2489b8 100644 --- a/config/locales/zh.yml +++ b/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 \ No newline at end of file