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

Custom fields were not saved

Browse Source
This commit is contained in:
Karel Pičman 2015-04-01 10:39:39 +02:00
parent b6e8b08622
commit 6da4552b1b
2 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
app/controllers/dmsf_controller.rb
View File

@ -258,9 +258,17 @@ class DmsfController < ApplicationController
end
@folder.project = @project
@folder.user = User.current
# Custom fields
if params[:dmsf_folder][:custom_field_values].present?
params[:dmsf_folder][:custom_field_values].each_with_index do |v, i|
@folder.custom_field_values[i].value = v[1]
end
end
if @folder.save
flash[:notice] = l(:notice_folder_created)
redirect_to({:controller => 'dmsf', :action => 'show', :id => @project, :folder_id => @folder})
flash[:notice] = l(:notice_folder_created)
redirect_to dmsf_folder_path(:id => @project, :folder_id => @folder)
else
@pathfolder = @parent
render :action => 'edit'
@ -273,15 +281,23 @@ class DmsfController < ApplicationController
end
def save
unless params[:dmsf_folder]
redirect_to :controller => 'dmsf', :action => 'show', :id => @project, :folder_id => @folder
unless params[:dmsf_folder]
redirect_to dmsf_folder_path(:id => @project, :folder_id => @folder)
return
end
@pathfolder = copy_folder(@folder)
@folder.attributes = params[:dmsf_folder]
# Custom fields
if params[:dmsf_folder][:custom_field_values].present?
params[:dmsf_folder][:custom_field_values].each_with_index do |v, i|
@folder.custom_field_values[i].value = v[1]
end
end
if @folder.save
flash[:notice] = l(:notice_folder_details_were_saved)
redirect_to :controller => 'dmsf', :action => 'show', :id => @project, :folder_id => @folder
flash[:notice] = l(:notice_folder_details_were_saved)
redirect_to dmsf_folder_path(:id => @project, :folder_id => @folder)
else
render :action => 'edit'
end

7
app/controllers/dmsf_files_controller.rb
View File

@ -137,6 +137,13 @@ class DmsfFilesController < ApplicationController
revision.disk_filename = revision.new_storage_filename
revision.mime_type = Redmine::MimeType.of(file_upload.original_filename)
end
# Custom fields
if params[:dmsf_file_revision][:custom_field_values].present?
params[:dmsf_file_revision][:custom_field_values].each_with_index do |v, i|
revision.custom_field_values[i].value = v[1]
end
end
@file.name = revision.name