remove trailing white-spaces from vendor/plugins/acts_as_attachable/lib/acts_as_attachable.rb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9302 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
1 parent
0e7a2dd688
commit
f9d123c08f
1 file changed
+6
-6
@@ -1,16 +1,16 @@
|
|||||||
# Redmine - project management software
|
# Redmine - project management software
|
||||||
# Copyright (C) 2006-2011 Jean-Philippe Lang
|
# Copyright (C) 2006-2012 Jean-Philippe Lang
|
||||||
#
|
#
|
||||||
# This program is free software; you can redistribute it and/or
|
# This program is free software; you can redistribute it and/or
|
||||||
# modify it under the terms of the GNU General Public License
|
# modify it under the terms of the GNU General Public License
|
||||||
# as published by the Free Software Foundation; either version 2
|
# as published by the Free Software Foundation; either version 2
|
||||||
# of the License, or (at your option) any later version.
|
# of the License, or (at your option) any later version.
|
||||||
#
|
#
|
||||||
# This program is distributed in the hope that it will be useful,
|
# This program is distributed in the hope that it will be useful,
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
# GNU General Public License for more details.
|
# GNU General Public License for more details.
|
||||||
#
|
#
|
||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with this program; if not, write to the Free Software
|
# along with this program; if not, write to the Free Software
|
||||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
@@ -28,7 +28,7 @@ module Redmine
|
|||||||
self.attachable_options = {}
|
self.attachable_options = {}
|
||||||
attachable_options[:view_permission] = options.delete(:view_permission) || "view_#{self.name.pluralize.underscore}".to_sym
|
attachable_options[:view_permission] = options.delete(:view_permission) || "view_#{self.name.pluralize.underscore}".to_sym
|
||||||
attachable_options[:delete_permission] = options.delete(:delete_permission) || "edit_#{self.name.pluralize.underscore}".to_sym
|
attachable_options[:delete_permission] = options.delete(:delete_permission) || "edit_#{self.name.pluralize.underscore}".to_sym
|
||||||
|
|
||||||
has_many :attachments, options.merge(:as => :container,
|
has_many :attachments, options.merge(:as => :container,
|
||||||
:order => "#{Attachment.table_name}.created_on",
|
:order => "#{Attachment.table_name}.created_on",
|
||||||
:dependent => :destroy)
|
:dependent => :destroy)
|
||||||
@@ -41,12 +41,12 @@ module Redmine
|
|||||||
def self.included(base)
|
def self.included(base)
|
||||||
base.extend ClassMethods
|
base.extend ClassMethods
|
||||||
end
|
end
|
||||||
|
|
||||||
def attachments_visible?(user=User.current)
|
def attachments_visible?(user=User.current)
|
||||||
(respond_to?(:visible?) ? visible?(user) : true) &&
|
(respond_to?(:visible?) ? visible?(user) : true) &&
|
||||||
user.allowed_to?(self.class.attachable_options[:view_permission], self.project)
|
user.allowed_to?(self.class.attachable_options[:view_permission], self.project)
|
||||||
end
|
end
|
||||||
|
|
||||||
def attachments_deletable?(user=User.current)
|
def attachments_deletable?(user=User.current)
|
||||||
(respond_to?(:visible?) ? visible?(user) : true) &&
|
(respond_to?(:visible?) ? visible?(user) : true) &&
|
||||||
user.allowed_to?(self.class.attachable_options[:delete_permission], self.project)
|
user.allowed_to?(self.class.attachable_options[:delete_permission], self.project)
|
||||||
|
|||||||
Reference in new issue
Block a user