Merge branch 'master' of github.com:danmunn/redmine_dmsf

This commit is contained in:
Karel Picman 2018-03-05 14:00:48 +01:00
commit 33b1fc4087

View File

@ -69,7 +69,7 @@ class DmsfFileContainerRollback < ActiveRecord::Migration
def down
# 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
rename_column :dmsf_files, :project_id, :container_id
add_column :dmsf_files, :project_id, :int, :null => true # temporarily added for the save method