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

Redmine3 support #364

Browse Source
This commit is contained in:
Karel Pičman 2015-03-25 12:58:01 +01:00
parent fde9b16bd4
commit dd6b70f7dd
11 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/dmsf_controller.rb
View File

@ -227,7 +227,7 @@ class DmsfController < ApplicationController
end end
def entries_email def entries_email
if (Redmine::VERSION::MAJOR >= 3) if (Rails::VERSION::MAJOR > 3)
@email_params = e_params @email_params = e_params
else else
@email_params = params[:email] @email_params = params[:email]
@ -251,7 +251,7 @@ class DmsfController < ApplicationController
end end
def create def create
if (Redmine::VERSION::MAJOR >= 3) if (Rails::VERSION::MAJOR > 3)
@folder = DmsfFolder.new( @folder = DmsfFolder.new(
params.require(:dmsf_folder).permit(:title, :description, :dmsf_folder_id)) params.require(:dmsf_folder).permit(:title, :description, :dmsf_folder_id))
else else

2
app/controllers/dmsf_files_controller.rb
View File

@ -100,7 +100,7 @@ class DmsfFilesController < ApplicationController
if @file.locked_for_user? if @file.locked_for_user?
flash[:error] = l(:error_file_is_locked) flash[:error] = l(:error_file_is_locked)
else else
if (Redmine::VERSION::MAJOR >= 3) if (Rails::VERSION::MAJOR > 3)
aparams = frev_params aparams = frev_params
else else
aparams = params aparams = params

2
app/controllers/dmsf_links_controller.rb
View File

@ -25,7 +25,7 @@ class DmsfLinksController < ApplicationController
before_filter :authorize before_filter :authorize
def new def new
if (Redmine::VERSION::MAJOR >= 3) if (Rails::VERSION::MAJOR > 3)
@dmsf_link = DmsfLink.new(l_params) @dmsf_link = DmsfLink.new(l_params)
else else
@dmsf_link = DmsfLink.new(:project_id => params[:project_id]) @dmsf_link = DmsfLink.new(:project_id => params[:project_id])

4
app/controllers/dmsf_upload_controller.rb
View File

@ -52,7 +52,7 @@ class DmsfUploadController < ApplicationController
# async single file upload handling # async single file upload handling
def upload_file def upload_file
if (Redmine::VERSION::MAJOR >= 3) if (Rails::VERSION::MAJOR > 3)
@tempfile = params.require(:file) @tempfile = params.require(:file)
else else
@tempfile = params[:file] @tempfile = params[:file]
@ -86,7 +86,7 @@ class DmsfUploadController < ApplicationController
end end
def commit_files def commit_files
if (Redmine::VERSION::MAJOR >= 3) if (Rails::VERSION::MAJOR > 3)
commited_files = params.require(:commited_files) commited_files = params.require(:commited_files)
else else
commited_files = params[:commited_files] commited_files = params[:commited_files]

6
app/models/dmsf_file.rb
View File

@ -36,7 +36,7 @@ class DmsfFile < ActiveRecord::Base
belongs_to :folder, :class_name => 'DmsfFolder', :foreign_key => 'dmsf_folder_id' belongs_to :folder, :class_name => 'DmsfFolder', :foreign_key => 'dmsf_folder_id'
belongs_to :deleted_by_user, :class_name => 'User', :foreign_key => 'deleted_by_user_id' belongs_to :deleted_by_user, :class_name => 'User', :foreign_key => 'deleted_by_user_id'
if (Redmine::VERSION::MAJOR >= 3) if (Rails::VERSION::MAJOR > 3)
has_many :revisions, -> { order("#{DmsfFileRevision.table_name}.major_version DESC, #{DmsfFileRevision.table_name}.minor_version DESC, #{DmsfFileRevision.table_name}.updated_at DESC") }, has_many :revisions, -> { order("#{DmsfFileRevision.table_name}.major_version DESC, #{DmsfFileRevision.table_name}.minor_version DESC, #{DmsfFileRevision.table_name}.updated_at DESC") },
:class_name => 'DmsfFileRevision', :foreign_key => 'dmsf_file_id', :class_name => 'DmsfFileRevision', :foreign_key => 'dmsf_file_id',
:dependent => :destroy :dependent => :destroy
@ -57,11 +57,11 @@ class DmsfFile < ActiveRecord::Base
:conditions => {:target_type => DmsfFile.model_name}, :dependent => :destroy :conditions => {:target_type => DmsfFile.model_name}, :dependent => :destroy
end end
if (Redmine::VERSION::MAJOR >= 3) if (Rails::VERSION::MAJOR > 3)
accepts_nested_attributes_for :revisions, :locks, :referenced_links accepts_nested_attributes_for :revisions, :locks, :referenced_links
end end
if (Redmine::VERSION::MAJOR >= 3) if (Rails::VERSION::MAJOR > 3)
scope :visible, -> { where(deleted: false) } scope :visible, -> { where(deleted: false) }
scope :deleted, -> { where(deleted: true) } scope :deleted, -> { where(deleted: true) }
else else

6
app/models/dmsf_file_revision.rb
View File

@ -26,13 +26,13 @@ class DmsfFileRevision < ActiveRecord::Base
belongs_to :deleted_by_user, :class_name => 'User', :foreign_key => 'deleted_by_user_id' belongs_to :deleted_by_user, :class_name => 'User', :foreign_key => 'deleted_by_user_id'
has_many :access, :class_name => 'DmsfFileRevisionAccess', :foreign_key => 'dmsf_file_revision_id', :dependent => :destroy has_many :access, :class_name => 'DmsfFileRevisionAccess', :foreign_key => 'dmsf_file_revision_id', :dependent => :destroy
has_many :dmsf_workflow_step_assignment, :dependent => :destroy has_many :dmsf_workflow_step_assignment, :dependent => :destroy
if (Redmine::VERSION::MAJOR >= 3) if (Rails::VERSION::MAJOR > 3)
accepts_nested_attributes_for :access, :dmsf_workflow_step_assignment, :file, :user accepts_nested_attributes_for :access, :dmsf_workflow_step_assignment, :file, :user
end end
# Returns a list of revisions that are not deleted here, or deleted at parent level either # Returns a list of revisions that are not deleted here, or deleted at parent level either
if (Redmine::VERSION::MAJOR >= 3) if (Rails::VERSION::MAJOR > 3)
scope :visible, -> { where(deleted: false) } scope :visible, -> { where(deleted: false) }
scope :deleted, -> { where(deleted: true) } scope :deleted, -> { where(deleted: true) }
else else
@ -46,7 +46,7 @@ class DmsfFileRevision < ActiveRecord::Base
:datetime => Proc.new {|o| o.updated_at }, :datetime => Proc.new {|o| o.updated_at },
:description => Proc.new {|o| o.comment }, :description => Proc.new {|o| o.comment },
:author => Proc.new {|o| o.user } :author => Proc.new {|o| o.user }
if (Redmine::VERSION::MAJOR >= 3) if (Rails::VERSION::MAJOR > 3)
acts_as_activity_provider :type => 'dmsf_file_revisions', acts_as_activity_provider :type => 'dmsf_file_revisions',
:timestamp => "#{DmsfFileRevision.table_name}.updated_at", :timestamp => "#{DmsfFileRevision.table_name}.updated_at",
:author_key => "#{DmsfFileRevision.table_name}.user_id", :author_key => "#{DmsfFileRevision.table_name}.user_id",

4
app/models/dmsf_file_revision_access.rb
View File

@ -22,7 +22,7 @@ class DmsfFileRevisionAccess < ActiveRecord::Base
belongs_to :user belongs_to :user
delegate :project, :to => :revision, :allow_nil => false delegate :project, :to => :revision, :allow_nil => false
delegate :file, :to => :revision, :allow_nil => false delegate :file, :to => :revision, :allow_nil => false
if (Redmine::VERSION::MAJOR >= 3) if (Rails::VERSION::MAJOR > 3)
accepts_nested_attributes_for :user, :revision accepts_nested_attributes_for :user, :revision
end end
@ -34,7 +34,7 @@ class DmsfFileRevisionAccess < ActiveRecord::Base
:datetime => Proc.new {|o| o.updated_at }, :datetime => Proc.new {|o| o.updated_at },
:description => Proc.new {|o| o.revision.comment }, :description => Proc.new {|o| o.revision.comment },
:author => Proc.new {|o| o.user } :author => Proc.new {|o| o.user }
if (Redmine::VERSION::MAJOR >= 3) if (Rails::VERSION::MAJOR > 3)
acts_as_activity_provider :type => 'dmsf_file_revision_accesses', acts_as_activity_provider :type => 'dmsf_file_revision_accesses',
:timestamp => "#{DmsfFileRevisionAccess.table_name}.updated_at", :timestamp => "#{DmsfFileRevisionAccess.table_name}.updated_at",
:author_key => "#{DmsfFileRevisionAccess.table_name}.user_id", :author_key => "#{DmsfFileRevisionAccess.table_name}.user_id",

4
app/models/dmsf_folder.rb
View File

@ -34,7 +34,7 @@ class DmsfFolder < ActiveRecord::Base
:dependent => :destroy :dependent => :destroy
has_many :files, :class_name => 'DmsfFile', :foreign_key => 'dmsf_folder_id', has_many :files, :class_name => 'DmsfFile', :foreign_key => 'dmsf_folder_id',
:dependent => :destroy :dependent => :destroy
if (Redmine::VERSION::MAJOR >= 3) if (Rails::VERSION::MAJOR > 3)
has_many :folder_links, -> { where target_type: DmsfFolder.model_name }, has_many :folder_links, -> { where target_type: DmsfFolder.model_name },
:class_name => 'DmsfLink', :foreign_key => 'dmsf_folder_id', :dependent => :destroy :class_name => 'DmsfLink', :foreign_key => 'dmsf_folder_id', :dependent => :destroy
has_many :file_links, -> { where target_type: DmsfFile.model_name }, has_many :file_links, -> { where target_type: DmsfFile.model_name },
@ -61,7 +61,7 @@ class DmsfFolder < ActiveRecord::Base
:dependent => :destroy :dependent => :destroy
end end
if (Redmine::VERSION::MAJOR >= 3) if (Rails::VERSION::MAJOR > 3)
scope :visible, -> { where(deleted: false) } scope :visible, -> { where(deleted: false) }
scope :deleted, -> { where(deleted: true) } scope :deleted, -> { where(deleted: true) }
else else

2
app/models/dmsf_link.rb
View File

@ -40,7 +40,7 @@ class DmsfLink < ActiveRecord::Base
end end
end end
if (Redmine::VERSION::MAJOR >= 3) if (Rails::VERSION::MAJOR > 3)
scope :visible, -> { where(deleted: false) } scope :visible, -> { where(deleted: false) }
scope :deleted, -> { where(deleted: true) } scope :deleted, -> { where(deleted: true) }
else else

2
app/models/dmsf_workflow.rb
View File

@ -19,7 +19,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
class DmsfWorkflow < ActiveRecord::Base class DmsfWorkflow < ActiveRecord::Base
if (Redmine::VERSION::MAJOR >= 3) if (Rails::VERSION::MAJOR > 3)
has_many :dmsf_workflow_steps, -> { order 'step ASC, operator DESC' }, :dependent => :destroy has_many :dmsf_workflow_steps, -> { order 'step ASC, operator DESC' }, :dependent => :destroy
else else
has_many :dmsf_workflow_steps, :dependent => :destroy, :order => 'step ASC, operator DESC' has_many :dmsf_workflow_steps, :dependent => :destroy, :order => 'step ASC, operator DESC'

2
lib/redmine_dmsf/patches/project_patch.rb
View File

@ -32,7 +32,7 @@ module RedmineDmsf
unloadable unloadable
alias_method_chain :copy, :dmsf alias_method_chain :copy, :dmsf
if (Redmine::VERSION::MAJOR >= 3) if (Rails::VERSION::MAJOR > 3)
has_many :dmsf_files, -> { where dmsf_folder_id: nil}, has_many :dmsf_files, -> { where dmsf_folder_id: nil},
:class_name => 'DmsfFile', :foreign_key => 'project_id', :dependent => :destroy :class_name => 'DmsfFile', :foreign_key => 'project_id', :dependent => :destroy
has_many :dmsf_folders, -> {where dmsf_folder_id: nil}, has_many :dmsf_folders, -> {where dmsf_folder_id: nil},