From c51d87250bf19c44e9029d0d54aaf023f83d4b1e Mon Sep 17 00:00:00 2001
From: Karel Picman <karel.picman@kontron.com>
Date: Wed, 24 May 2017 13:37:22 +0200
Subject: [PATCH] #48 Attaching DMS links to issues

---
 app/controllers/dmsf_controller.rb       | 3 ++-
 app/controllers/dmsf_links_controller.rb | 2 --
 app/models/dmsf_folder.rb                | 2 +-
 app/views/dmsf_links/_form.html.erb      | 8 +++++++-
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/controllers/dmsf_controller.rb b/app/controllers/dmsf_controller.rb
index feeced3a..4583d4fe 100644
--- a/app/controllers/dmsf_controller.rb
+++ b/app/controllers/dmsf_controller.rb
@@ -1,4 +1,5 @@
 # encoding: utf-8
+# encoding: utf-8
 #
 # Redmine plugin for Document Management System "Features"
 #
@@ -217,7 +218,7 @@ class DmsfController < ApplicationController
         end
       end
     end
-
+    
     saved = @folder.save
 
     respond_to do |format|
diff --git a/app/controllers/dmsf_links_controller.rb b/app/controllers/dmsf_links_controller.rb
index 7d8eb1a2..d325b0dc 100644
--- a/app/controllers/dmsf_links_controller.rb
+++ b/app/controllers/dmsf_links_controller.rb
@@ -101,7 +101,6 @@ class DmsfLinksController < ApplicationController
       else
         @dmsf_link.target_id = DmsfLinksHelper.is_a_number?(
           params[:dmsf_link][:target_folder_id]) ? params[:dmsf_link][:target_folder_id].to_i : nil
-        @dmsf_link.target_id = nil if(@dmsf_link.target_id == 0)
         @dmsf_link.target_type = DmsfFolder.model_name.to_s
       end
       @dmsf_link.name = params[:dmsf_link][:name]
@@ -115,7 +114,6 @@ class DmsfLinksController < ApplicationController
       @dmsf_link.project_id = params[:dmsf_link][:target_project_id]
       @dmsf_link.dmsf_folder_id = DmsfLinksHelper.is_a_number?(
         params[:dmsf_link][:target_folder_id]) ? params[:dmsf_link][:target_folder_id].to_i : nil
-      @dmsf_link.dmsf_folder_id = nil if(@dmsf_link.dmsf_folder_id == 0)
       @dmsf_link.target_project_id = params[:dmsf_link][:project_id]
       if params[:dmsf_link][:dmsf_file_id].present?
         @dmsf_link.target_id = params[:dmsf_link][:dmsf_file_id]
diff --git a/app/models/dmsf_folder.rb b/app/models/dmsf_folder.rb
index 6248d6f7..491ac736 100644
--- a/app/models/dmsf_folder.rb
+++ b/app/models/dmsf_folder.rb
@@ -213,7 +213,7 @@ class DmsfFolder < ActiveRecord::Base
     unless project.is_a? Project
       project = Project.find_by_id project
     end
-    tree = [[l(:link_documents), 0]]
+    tree = [[l(:link_documents), nil]]
     project.dmsf_folders.visible(false).each do |folder|
       unless folder == current_folder
         tree.push(["...#{folder.title}", folder.id])
diff --git a/app/views/dmsf_links/_form.html.erb b/app/views/dmsf_links/_form.html.erb
index 608176db..d9b3d7fd 100644
--- a/app/views/dmsf_links/_form.html.erb
+++ b/app/views/dmsf_links/_form.html.erb
@@ -93,7 +93,13 @@
       <%= f.text_field :name, :required => true %>
     </p>
   </div>
-  <p><%= f.submit l(:button_create), :onclick => 'hideModal(this);' %></p>
+  <p>
+    <% if modal %>
+        <%= f.submit l(:button_create), :onclick => 'hideModal(this);' %>
+    <% else %>
+        <%= f.submit l(:button_create) %>
+    <% end %>
+  </p>
 <% end %>
 
 <script type="text/javascript">