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

Merge branch 'master' into devel-1.6.1

Browse Source
This commit is contained in:
Karel Picman 2018-03-05 14:01:37 +01:00
commit e5f3c30a82
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -82,7 +82,7 @@
:max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i, :max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i,
:upload_path => dmsf_uploads_path(:format => 'js'), :upload_path => dmsf_uploads_path(:format => 'js'),
:description_placeholder => l(:label_optional_description), :description_placeholder => l(:label_optional_description),
:project => "#{@project.identifier}", :project => @project ? "#{@project.identifier}" : "",
:description => description, :description => description,
:awf => awf :awf => awf
} %> } %>

2
db/migrate/20170421101901_dmsf_file_container_rollback.rb
View File

@ -69,7 +69,7 @@ class DmsfFileContainerRollback < ActiveRecord::Migration
def down def down
# dmsf_files # dmsf_files
file_folder_ids = DmsfFile.joins(:dmsf_folder).where(:dmsf_folders => { :system => true }).pluck('dmsf_files.id, cast(dmsf_folders.title as int)') file_folder_ids = DmsfFile.joins(:dmsf_folder).where(:dmsf_folders => { :system => true }).pluck('dmsf_files.id, cast(dmsf_folders.title as decimal)')
remove_index :dmsf_files, :project_id remove_index :dmsf_files, :project_id
rename_column :dmsf_files, :project_id, :container_id rename_column :dmsf_files, :project_id, :container_id
add_column :dmsf_files, :project_id, :int, :null => true # temporarily added for the save method add_column :dmsf_files, :project_id, :int, :null => true # temporarily added for the save method