#48 Attaching DMS links to issues
This commit is contained in:
parent
10d786c6e4
commit
c51d87250b
@ -1,4 +1,5 @@
|
||||
# encoding: utf-8
|
||||
# encoding: utf-8
|
||||
#
|
||||
# Redmine plugin for Document Management System "Features"
|
||||
#
|
||||
|
||||
@ -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]
|
||||
|
||||
@ -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])
|
||||
|
||||
@ -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">
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user