From 6375720bcf286ccbec34544a75627af425a3601d Mon Sep 17 00:00:00 2001
From: "karel.picman@lbcfree.net" <karel.picman@lbcfree.net>
Date: Wed, 2 Dec 2020 13:56:03 +0100
Subject: [PATCH] #1187 Options of project copying

---
 .../redmine_dmsf/_view_projects_form.html.erb | 12 +++++++--
 config/locales/cs.yml                         |  3 ++-
 config/locales/de.yml                         |  3 ++-
 config/locales/en.yml                         |  3 ++-
 config/locales/es.yml                         |  3 ++-
 config/locales/fr.yml                         |  3 ++-
 config/locales/hu.yml                         |  3 ++-
 config/locales/it.yml                         |  3 ++-
 config/locales/ja.yml                         |  3 ++-
 config/locales/ko.yml                         |  3 ++-
 config/locales/nl.yml                         |  3 ++-
 config/locales/pl.yml                         |  3 ++-
 config/locales/pt-BR.yml                      |  3 ++-
 config/locales/ru.yml                         |  3 ++-
 config/locales/sl.yml                         |  3 ++-
 config/locales/zh-TW.yml                      |  4 +--
 config/locales/zh.yml                         |  3 ++-
 lib/redmine_dmsf/patches/project_patch.rb     | 25 +++++++++++--------
 18 files changed, 57 insertions(+), 29 deletions(-)

diff --git a/app/views/hooks/redmine_dmsf/_view_projects_form.html.erb b/app/views/hooks/redmine_dmsf/_view_projects_form.html.erb
index 4366dfc6..6c4d3055 100644
--- a/app/views/hooks/redmine_dmsf/_view_projects_form.html.erb
+++ b/app/views/hooks/redmine_dmsf/_view_projects_form.html.erb
@@ -24,10 +24,18 @@
 
 <% if @project.new_record? && @source_project %>
   <p>
+    <% counts = @source_project.dmsf_count %>
     <label class="block">
       <% value = params['only'].blank? || params['only'].include?('dmsf') %>
-      <%= check_box_tag 'only[]', 'dmsf', value %>
-      <%= l(:label_dmsf_plural, @source_project.dmsf_count) %>
+      <%= check_box_tag 'only_dmsf', 'dmsf', value, name: 'only[]',
+                        onfocus: "$('#only_dmsf_folders').prop('checked', false);" %>
+      <%= l(:label_copy_dmsf, counts) %>
+    </label>
+    <label class="block">
+      <% value = params['only'].present? && params['only'].include?('dmsf_folders') %>
+      <%= check_box_tag 'only_dmsf_folders', 'dmsf_folders', value, name: 'only[]',
+                        onfocus: "$('#only_dmsf').prop('checked', false);" %>
+      <%= l(:label_copy_only_dmsf_folders, counts) %>
     </label>
     <label class="block">
       <% value = params['only'].blank? || params['only'].include?('approval_workflows') %>
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index f2ab9d1e..7a69314a 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -210,7 +210,8 @@ cs:
   parent_directory: Nadřazená složka
   note_webdav: "Webdav je po aktivaci k dispozici na %{protocol}://%{domain}/dmsf/webdav/[identifikátor projektu]"
 
-  label_dmsf_plural: "Kopíruj dokumenty a složky (%{files} souborů v %{folders} složkách)"
+  label_copy_dmsf: "Kopíruj dokumenty a složky (%{files} souborů v %{folders} složkách)"
+  label_copy_only_dmsf_folders: "Kopíruj jenom a složky (%{folders})"
 
   warning_folder_already_locked: Tato složka je již zamčená
   notice_folder_locked: Složka byla úspěšně zamčena
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 71976732..232addcd 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -211,7 +211,8 @@ de:
   parent_directory: übergeordnetes Verzeichnis
   note_webdav: "Nach der Aktivierung von WebDav kann der Dienst über die URL
     %{protocol}://%{domain}/dmsf/webdav/[project identifier] erreicht werden."
-  label_dmsf_plural: "Kopieren von Dateien und Ordnern (%{files} Dateien in %{folders} Ordnern)"
+  label_copy_dmsf: "Kopieren von Dateien und Ordnern (%{files} Dateien in %{folders} Ordnern)"
+  label_copy_only_dmsf_folders: "Kopieren nur von Ordnern (%{folders})"
 
   warning_folder_already_locked: Dieser Ordner ist bereits gesperrt
   notice_folder_locked: Der Ordner wurde erfolgreich gesperrt
diff --git a/config/locales/en.yml b/config/locales/en.yml
index dc324a7c..71d0cbc6 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -210,7 +210,8 @@ en:
   parent_directory: Parent Directory
   note_webdav: "Webdav once enabled can be found at %{protocol}://%{domain}/dmsf/webdav/[project identifier]"
 
-  label_dmsf_plural: "Copy Documents and Folders (%{files} files in %{folders} folders)"
+  label_copy_dmsf: "Copy documents and folders (%{files} files in %{folders} folders)"
+  label_copy_only_dmsf_folders: "Copy folders only (%{folders})"
 
   warning_folder_already_locked: This folder is already locked
   notice_folder_locked: The folder was successfully locked
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 877caf17..c9dd5bd8 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -210,7 +210,8 @@ es:
   parent_directory: Directorio padre
   note_webdav: "Si Webdav está habilitado, se puede encontrar en %{protocol}://%{domain}/dmsf/webdav/[project
     identifier]"
-  label_dmsf_plural: "Copiar archivos y directorios (%{files} archivos en %{folders} directorios)"
+  label_copy_dmsf: "Copiar archivos y directorios (%{files} archivos en %{folders} directorios)"
+  label_copy_only_dmsf_folders: "Copiar solamente directorios (%{folders})"
 
   warning_folder_already_locked: El directorio ya se encuentra bloqueado
   notice_folder_locked: "El directorio se bloqueó exitosamente"
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 6cab938c..c82f0fa5 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -210,7 +210,8 @@ fr:
   parent_directory: Dossier parent
   note_webdav: "Après l'activation du module Webdav, celui-ci sera accessible par
     %{protocol}://%{domain}/dmsf/webdav/[project identifier]"
-  label_dmsf_plural: "Copier les fichiers et les dossiers (%{files} fichiers dans %{folders} dossiers)"
+  label_copy_dmsf: "Copier les fichiers et les dossiers (%{files} fichiers dans %{folders} dossiers)"
+  label_copy_only_dmsf_folders: "Copier que les dossiers (%{folders})"
 
   warning_folder_already_locked: Ce dossier est déjà verrouillé
   notice_folder_locked: Dossier verrouillé
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 86fb755a..afd4cb96 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -210,7 +210,8 @@ hu:
   parent_directory: Szülő könyvtár
   note_webdav: "Webdav aktiválása után itt található %{protocol}://%{domain}/dmsf/webdav/[projekt azonosító]"
 
-  label_dmsf_plural: "Dokumentumok és mappák (%{files}  másolása a %{folders} mappákba"
+  label_copy_dmsf: "Dokumentumok és mappák (%{files}  másolása a %{folders} mappákba)"
+  label_copy_only_dmsf_folders: "Dokumentumok és mappák (%{folders})"
 
   warning_folder_already_locked: Ez a mappa már zárolva
   notice_folder_locked: A mappa sikeresen lett zárolva
diff --git a/config/locales/it.yml b/config/locales/it.yml
index bdf10907..449b7e8a 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -210,7 +210,8 @@ it: # Italian strings thx 2 Matteo Arceci!
   parent_directory: Cartella superiore
   note_webdav: "Una volta abilitato il Webdav può essere contattato sul percorso
     %{protocol}://%{domain}/dmsf/webdav/[project identifier]"
-  label_dmsf_plural: "Copia documenti e cartelle (%{files} documenti in %{folders} cartelle)"
+  label_copy_dmsf: "Copia documenti e cartelle (%{files} documenti in %{folders} cartelle)"
+  label_copy_only_dmsf_folders: "Copia solo documenti (%{folders})"
 
   warning_folder_already_locked: Questa cartella è già bloccata
   notice_folder_locked: La cartella è stata bloccata
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 2379e8ab..0261953b 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -210,7 +210,8 @@ ja:
   parent_directory: "親フォルダ"
   note_webdav: "WebDAVを有効にすると %{protocol}://%{domain}/dmsf/webdav/[project identifier] で閲覧することができます"
 
-  label_dmsf_plural: "ファイルとフォルダをコピーします (%{files} ファイルを含む %{folders} フォルダ)"
+  label_copy_dmsf: "ファイルとフォルダをコピーします (%{files} ファイルを含む %{folders} フォルダ)"
+  label_copy_only_dmsf_folders: "ファイルとフォルダをコピーします (%{folders})"
 
   warning_folder_already_locked: "このフォルダは既にロックされています"
   notice_folder_locked: "フォルダをロックしました"
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index bdce25bf..112dd2e7 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -210,7 +210,8 @@ ko:
   parent_directory: 상위 디렉토리
   note_webdav: "활성화된 WebDAV는 %{protocol}에서 확인할 수 있습니다://%{domain}/dmsf/webdav/[project identifier]"
 
-  label_dmsf_plural: "문서 및 폴더 복사 (%{folders} 폴더의 %{files} 파일들)"
+  label_copy_dmsf: "문서 및 폴더 복사 (%{folders} 폴더의 %{files} 파일들)"
+  label_copy_only_dmsf_folders: "문서 및 폴더 복사 (%{folders})"
 
   warning_folder_already_locked: 이 폴더는 이미 잠겨있습니다
   notice_folder_locked: 이 폴더는 성공적으로 잠겨있습니다
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 6331db36..4d8f996b 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -210,7 +210,8 @@ nl:
   parent_directory: Ouder directory
   note_webdav: "Webdav kan indien ingeschakeld worden gevonden op %{protocol}://%{domain}/dmsf/webdav/[project
     identifier]"
-  label_dmsf_plural: "Kopieer Documenten en mappen (%{files} bestanden in %{folders} mappen)"
+  label_copy_dmsf: "Kopieer documenten en mappen (%{files} bestanden in %{folders} mappen)"
+  label_copy_only_dmsf_folders: "Kopieer mappen (%{folders})"
 
   warning_folder_already_locked: Deze map is al vergrendeld
   notice_folder_locked: Deze map is succesvol vergrendeld
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index bae295f6..3469dda7 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -210,7 +210,8 @@ pl:
   parent_directory: Folder nadrzędny
   note_webdav: "Webdav once enabled can be found at %{protocol}://%{domain}/dmsf/webdav/[project identifier]"
 
-  label_dmsf_plural: "Skopiuj pliki i foldery (%{files} plików w %{folders} folderach)"
+  label_copy_dmsf: "Skopiuj pliki i foldery (%{files} plików w %{folders} folderach)"
+  label_copy_only_dmsf_folders: "Skopiuj tylko foldery (%{folders})"
 
   warning_folder_already_locked: Folder jest już zablokowany
   notice_folder_locked: Folder został zablokowany
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index ae82f4a5..d7e81ab1 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -210,7 +210,8 @@ pt-BR:
   parent_directory: Diretório Pai
   note_webdav: "Webdav uma vez habilitado pode ser encontrado em %{protocol}://%{domain}/dmsf/webdav/[project
     identifier]"
-  label_dmsf_plural: "Copiar documentos e pastas (%{files} documentos em %{folders} pastas)"
+  label_copy_dmsf: "Copiar documentos e pastas (%{files} documentos em %{folders} pastas)"
+  label_copy_only_dmsf_folders: "Copiar pastas (%{folders})"
 
   warning_folder_already_locked: Esta pasta já está bloqueada
   notice_folder_locked: A pasta foi bloqueada com sucesso
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 5fd815b4..4f2e9420 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -210,7 +210,8 @@ ru:
   parent_directory: "Родительская директория"
   note_webdav: "После включения, WebDAV можно найти по адресу %{protocol}://%{domain}/dmsf/webdav/[project identifier]"
 
-  label_dmsf_plural: "Скопировать файлы и папки (%{files} файлов в %{folders} папках)"
+  label_copy_dmsf: "Скопировать файлы и папки (%{files} файлов в %{folders} папках)"
+  label_copy_only_dmsf_folders: "Скопировать то́лько папки (%{folders})"
 
   warning_folder_already_locked: "Эта папка уже заблокирована"
   notice_folder_locked: "Папка была успешно заблокирована"
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 5b94ef2d..027fde33 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -210,7 +210,8 @@ sl:
   parent_directory: Nadrejena mapa
   note_webdav: "Webdav po vklopu lahko najdete na %{protocol}://%{domain}/dmsf/webdav/[project identifier]"
 
-  label_dmsf_plural: "Kopiraj Arhivske datoteke in mape (%{files} datoteke v %{folders} mape)"
+  label_copy_dmsf: "Kopiraj Arhivske datoteke in mape (%{files} datoteke v %{folders} mape)"
+  label_copy_only_dmsf_folders: "Kopiraj mape (%{folders})"
 
   warning_folder_already_locked: Mapa je že zaklenjena
   notice_folder_locked: Mapa je uspešno zaklenjena
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 053caf14..5a88d3b8 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -210,8 +210,8 @@ zh-TW:
   parent_directory: 上層目錄
   note_webdav: "Webdav 啟用後，可在下列網址被找到: %{protocol}://%{domain}/dmsf/webdav/[project identifier]"
 
-  label_dmsf_plural: "複制文件總管的檔案和資料夾。 ( 資料夾: %{folders} 檔案: %{files} )"
-
+  label_copy_dmsf: "複制文件總管的檔案和資料夾。 ( 資料夾: %{folders} 檔案: %{files} )"
+  label_copy_only_dmsf_folders: "複制文件總管的檔案和資料夾。 (%{folders})"
   warning_folder_already_locked: 這個資料夾己經被鎖定了
   notice_folder_locked: 這個資料夾己經成功地鎖定了。
   warning_folder_not_locked: 不好意思，這個資料夾無法被鎖定。
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 56b5ba50..72cecd80 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -210,7 +210,8 @@ zh:
   parent_directory: Parent Directory
   note_webdav: "Webdav once enabled can be found at %{protocol}://%{domain}/dmsf/webdav/[project identifier]"
 
-  label_dmsf_plural: "Copy documents and folders (%{files} files in %{folders} folders)"
+  label_copy_dmsf: "Copy documents and folders (%{files} files in %{folders} folders)"
+  label_copy_only_dmsf_folders: "Copy documents only (%{folders})"
 
   warning_folder_already_locked: This folder is already locked
   notice_folder_locked: The folder was successfully locked
diff --git a/lib/redmine_dmsf/patches/project_patch.rb b/lib/redmine_dmsf/patches/project_patch.rb
index 6dc0195e..9bcac51e 100644
--- a/lib/redmine_dmsf/patches/project_patch.rb
+++ b/lib/redmine_dmsf/patches/project_patch.rb
@@ -32,7 +32,7 @@ module RedmineDmsf
       def copy(project, options={})
         super(project, options)
         project = project.is_a?(Project) ? project : Project.find(project)
-        to_be_copied = %w(dmsf approval_workflows)
+        to_be_copied = %w(dmsf dmsf_folders approval_workflows)
         to_be_copied = to_be_copied & Array.wrap(options[:only]) unless options[:only].nil?
         if save
           to_be_copied.each do |name|
@@ -87,23 +87,28 @@ module RedmineDmsf
 
       # Simple yet effective approach to copying things
       def copy_dmsf(project)
-        project.dmsf_folders.visible.each do |f|
-          f.copy_to(self, nil)
-        end
+        copy_dmsf_folders project
         project.dmsf_files.visible.each do |f|
-          f.copy_to(self, nil)
-        end
-        project.folder_links.visible.each do |l|
-          l.copy_to(self, nil)
+          f.copy_to self, nil
         end
         project.file_links.visible.each do |l|
-          l.copy_to(self, nil)
+          l.copy_to self, nil
         end
         project.url_links.visible.each do |l|
-          l.copy_to(self, nil)
+          l.copy_to self, nil
         end
       end
 
+      def copy_dmsf_folders(project)
+        project.dmsf_folders.visible.each do |f|
+          f.copy_to self, nil
+        end
+        project.folder_links.visible.each do |l|
+          l.copy_to self, nil
+        end
+
+      end
+
       def copy_approval_workflows(project)
         project.dmsf_workflows.each do |wf|
           wf.copy_to self