From c58c71b759e7a813f1ff5f5a9b1ae788a052169f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Pi=C4=8Dman?= Date: Tue, 23 May 2023 09:29:35 +0200 Subject: [PATCH] @target_folder_id is always null --- app/controllers/dmsf_links_controller.rb | 4 +--- app/views/dmsf_links/_form.html.erb | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/app/controllers/dmsf_links_controller.rb b/app/controllers/dmsf_links_controller.rb index 4c60d77c..66bed41f 100644 --- a/app/controllers/dmsf_links_controller.rb +++ b/app/controllers/dmsf_links_controller.rb @@ -41,7 +41,6 @@ class DmsfLinksController < ApplicationController def initialize @dmsf_link = nil - @target_folder_id = nil super end @@ -54,14 +53,13 @@ class DmsfLinksController < ApplicationController @dmsf_file_id = params[:dmsf_file_id] @type = params[:type] @dmsf_link.target_project_id = params[:project_id] - @target_folder_id = nil @back_url = params[:back_url] if @type == 'link_to' if @dmsf_file_id f = DmsfFile.find_by(id: @dmsf_file_id) @dmsf_link.name = f&.last_revision&.title else - titles = DmsfFolder.where(id: @target_folder_id).pluck(:title) + titles = DmsfFolder.where(id: @dmsf_link.dmsf_folder_id).pluck(:title) @dmsf_link.name = titles.first if titles.any? end end diff --git a/app/views/dmsf_links/_form.html.erb b/app/views/dmsf_links/_form.html.erb index 92074146..df1bc658 100644 --- a/app/views/dmsf_links/_form.html.erb +++ b/app/views/dmsf_links/_form.html.erb @@ -86,7 +86,7 @@ <% if @type == 'link_from' %>

<%= label_tag 'dmsf_link[target_file_id]', l(:field_target_file) %> - <% files = files_for_select(@dmsf_link.target_project.id, @target_folder_id) %> + <% files = files_for_select(@dmsf_link.target_project.id) %> <%= select_tag 'dmsf_link[target_file_id]', options_for_select(DmsfFolder.file_list(files)), required: modal %>

<% end %>