redmine_plugins/redmine_dmsf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

@target_folder_id is always null

Browse Source
This commit is contained in:
Karel Pičman 2023-05-23 09:29:35 +02:00
parent a22081a34f
commit c58c71b759
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/dmsf_links_controller.rb
View File

@ -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

2
app/views/dmsf_links/_form.html.erb
View File

@ -86,7 +86,7 @@
<% if @type == 'link_from' %>
<p>
<%= 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 %>
</p>
<% end %>