#48 Attaching DMS links to issues

2017-05-25 10:41:36 +02:00 · 2017-05-25 10:41:36 +02:00 · 64e2c78e4a
commit 64e2c78e4a
parent c51d87250b
18 changed files with 26 additions and 23 deletions
--- a/app/controllers/dmsf_controller.rb
+++ b/app/controllers/dmsf_controller.rb
@ -218,7 +218,7 @@ class DmsfController < ApplicationController
        end
      end
    end
-    
+
    saved = @folder.save

    respond_to do |format|
--- a/app/models/dmsf_folder.rb
+++ b/app/models/dmsf_folder.rb
@ -59,6 +59,7 @@ class DmsfFolder < ActiveRecord::Base
    :deleted => STATUS_DELETED).where(DmsfFolder.visible_condition).distinct
  }
  scope :system, -> { where(:system => true) }
+  scope :notsystem, -> { where(:system => false) }

  acts_as_customizable

@ -214,7 +215,7 @@ class DmsfFolder < ActiveRecord::Base
      project = Project.find_by_id project
    end
    tree = [[l(:link_documents), nil]]
-    project.dmsf_folders.visible(false).each do |folder|
+    project.dmsf_folders.notsystem.visible(false).each do |folder|
      unless folder == current_folder
        tree.push(["...#{folder.title}", folder.id])
        directory_subtree(tree, folder, 2, current_folder)
--- a/app/views/dmsf_links/_form.html.erb
+++ b/app/views/dmsf_links/_form.html.erb
@ -80,15 +80,17 @@
          <%= label_tag('dmsf_link[target_file_id]', l(:field_target_file)) %>
          <% files = files_for_select(@dmsf_link.target_project.id, @target_folder_id) %>
          <%= select_tag('dmsf_link[target_file_id]',
-            options_for_select(DmsfFolder.file_list(files))) %>
+            options_for_select(DmsfFolder.file_list(files)), :required => modal) %>
        </p>
      <% end %>
    </div>
-    <div id="link_external" style="display: none">
-      <p>
-        <%= f.text_field :external_url, :required => true %>
-      </p>
-    </div>
+    <% if (@type == 'link_from') && !@container %>
+      <div id="link_external" style="display: none">
+        <p>
+          <%= f.text_field :external_url, :required => true %>
+        </p>
+      </div>
+    <% end %>
    <p>
      <%= f.text_field :name, :required => true %>
    </p>
--- a/assets/stylesheets/redmine_dmsf.css
+++ b/assets/stylesheets/redmine_dmsf.css
@ -129,7 +129,7 @@ table.display thead th div.DataTables_sort_wrapper span {
 	font-size: 0.9em;
 }

-.dmsf_uploader span[id*="dmsf_attachments"] .filename {
+.dmsf_uploader span[id*="dmsf_"] .filename {
    -webkit-box-shadow: none !important;
    box-shadow: none !important;
 }
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@ -290,7 +290,7 @@ cs:
  label_external: Externí

  label_link_name: Název odkazu
-  label_link_external_url: URL
+  field_external_url: URL
  label_target_folder: Cílová složka
  label_source_folder: Zdrojová složka
  label_target_project: Cílový projekt
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@ -290,7 +290,7 @@ de:
  label_external: Extern

  label_link_name: Name der Verknüpfung
-  label_link_external_url: URL
+  field_external_url: URL
  label_target_folder: Zielordner
  label_source_folder: Quellordner
  label_target_project: Zielprojekt
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@ -290,7 +290,7 @@ en:
  label_external: External

  label_link_name: Link name
-  label_link_external_url: URL
+  field_external_url: URL
  label_target_folder: Target folder
  label_source_folder: Source folder
  label_target_project: Target project
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@ -290,7 +290,7 @@ es:
  label_external: External

  label_link_name: Nombre de enlace
-  label_link_external_url: URL
+  field_external_url: URL
  label_target_folder: Directorio destino
  label_source_folder: Directorio fuente
  label_target_project: Proyecto destino
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@ -290,7 +290,7 @@ fr:
  label_external: Externe

  label_link_name: Nom du lien
-  label_link_external_url: Adresse Internet
+  field_external_url: Adresse Internet
  label_target_folder: Dossier cible
  label_source_folder: Dossier source
  label_target_project: Projet cible
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@ -289,7 +289,7 @@ hu:
  label_external: Külső

  label_link_name: Link elnevezése
-  label_link_external_url: URL
+  field_external_url: URL
  label_target_folder: Cél mappa
  label_source_folder: Forrás mappa
  label_target_project: Cél projekt
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@ -290,7 +290,7 @@ it: # Italian strings thx 2 Matteo Arceci!
  label_external: Esterno

  label_link_name: Nome del collegamento
-  label_link_external_url: URL
+  field_external_url: URL
  label_target_folder: Cartella di destinazione
  label_source_folder: Cartella sorgente
  label_target_project: Progetto di destinazione
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@ -290,7 +290,7 @@ ja:
  label_external: 外部

  label_link_name: リンク名
-  label_link_external_url: URL
+  field_external_url: URL
  label_target_folder: リンク先フォルダ
  label_source_folder: リンク元フォルダ
  label_target_project: リンク先プロジェクト
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@ -290,7 +290,7 @@ pl:
  label_external: External

  label_link_name: Nazwa odnośnika
-  label_link_external_url: URL
+  field_external_url: URL
  label_target_folder: Folder docelowy
  label_source_folder: Folder źródłowy
  label_target_project: Projekt docelowy
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@ -290,7 +290,7 @@ pt-BR:
  label_external: External

  label_link_name: Link name
-  label_link_external_url: URL
+  field_external_url: URL
  label_target_folder: Target folder
  label_source_folder: Source folder
  label_target_project: Target project
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@ -290,7 +290,7 @@ ru:
  label_external: Внешний

  label_link_name: Наименование ссылки
-  label_link_external_url: URL
+  field_external_url: URL
  label_target_folder: Целевая папка
  label_source_folder: Исходная папка
  label_target_project: Целевой проект
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@ -290,7 +290,7 @@ sl:
  label_external: External

  label_link_name: Link name
-  label_link_external_url: URL
+  field_external_url: URL
  label_target_folder: Target folder
  label_source_folder: Source folder
  label_target_project: Target project
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@ -290,7 +290,7 @@ zh-TW:
  label_external: External

  label_link_name: Link name
-  label_link_external_url: URL
+  field_external_url: URL
  label_target_folder: Target folder
  label_source_folder: Source folder
  label_target_project: Target project
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@ -290,7 +290,7 @@ zh:
  label_external: External

  label_link_name: Link name
-  label_link_external_url: URL
+  field_external_url: URL
  label_target_folder: Target folder
  label_source_folder: Source folder
  label_target_project: Target project