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

WIP: redmine3 support, continue

Browse Source
This commit is contained in:
Mathieu Le Marec - Pasquet 2015-03-22 18:11:39 +01:00
parent a075a26473
commit 394bf0008a
2 changed files with 50 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/controllers/dmsf_links_controller.rb
View File

@ -75,6 +75,7 @@ class DmsfLinksController < ApplicationController
@type = params[:type]
@link_external = false
@dmsf_link.target_project_id = params[:project_id]
@dmsf_link.project_id = params[:project_id]
@target_folder_id = params[:dmsf_folder_id].to_i if params[:dmsf_folder_id].present?
if @type == 'link_to'
if @dmsf_file_id
@ -197,7 +198,17 @@ class DmsfLinksController < ApplicationController
if @dmsf_link
@project = @dmsf_link.project
else
@project = Project.find(params[:dmsf_link].present? ? params[:dmsf_link][:project_id] : params[:project_id])
if params[:dmsf_link].present?
if params[:dmsf_link].fetch(:project_id, nil).blank?
pid = params[:dmsf_link].fetch(:target_project_id, nil)
else
pid = params[:dmsf_link][:project_id]
end
else
pid = params[:project_id]
end
Rails.logger.error("pid #{pid}")
@project = Project.find(pid)
end
rescue ActiveRecord::RecordNotFound
render_404