##// END OF EJS Templates
[#20288] Update styles to match CodeRay 1.1.0 (preserving changes of r10132)....
[#20288] Update styles to match CodeRay 1.1.0 (preserving changes of r10132). This commit updates the CSS styles to match with CodeRay 1.1.0, while it preserves the custom changes applied in r10132. The CSS styles were still based on CodeRay 1.0.6 (included since Redmine 1.4.0) with the custom changes from r10132 (included since Redmine 2.1.0). Redmine 2.3.2 till 2.3.4 came with CodeRay 1.0.9, an upgrade that didn't needed changes in the CSS styles. Starting with 2.4.0 Redmine comes with CodeRay 1.1.0, a minor upgrade that came with new/changed token_kinds and lots of changes in the alpha stylesheet, that in turn is used as a base for Redmine's own CodeRay CSS styles. As such, this upgrade needed CSS stylesheet changes like done before in r7618 and r7623 (for 1.0.0 upgrade) and r9389 (for 1.0.6 upgrade). But these changes, plus an update of the Redmine core documentation that is shipped along the core (wiki_syntax_detailed_[markdown|textile].html), aren't integrated up untill today. Contributed by Mischa The Evil. git-svn-id: http://svn.redmine.org/redmine/trunk@14488 e93f8b46-1217-0410-a6f0-8f06a7374b81

File last commit:

r13911:ed9f00178c65
r14106:6fbb56e55735
Show More
member_role.rb
80 lines | 2.4 KiB | text/x-ruby | RubyLexer
Jean-Philippe Lang
Allows multiple roles on the same project (#706). Prerequisite for user groups feature....
r2627 # Redmine - project management software
Jean-Philippe Lang
Copyright update....
r13490 # Copyright (C) 2006-2015 Jean-Philippe Lang
Jean-Philippe Lang
Allows multiple roles on the same project (#706). Prerequisite for user groups feature....
r2627 #
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
Toshi MARUYAMA
remove trailing white-spaces from app/models/member_role.rb....
r6382 #
Jean-Philippe Lang
Allows multiple roles on the same project (#706). Prerequisite for user groups feature....
r2627 # This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
Toshi MARUYAMA
remove trailing white-spaces from app/models/member_role.rb....
r6382 #
Jean-Philippe Lang
Allows multiple roles on the same project (#706). Prerequisite for user groups feature....
r2627 # You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
class MemberRole < ActiveRecord::Base
belongs_to :member
belongs_to :role
Toshi MARUYAMA
remove trailing white-spaces from app/models/member_role.rb....
r6382
Jean-Philippe Lang
User groups branch merged....
r2755 after_destroy :remove_member_if_empty
Jean-Philippe Lang
Optionaly inherit members from parent project (#5605)....
r11068 after_create :add_role_to_group_users, :add_role_to_subprojects
after_destroy :remove_inherited_roles
Toshi MARUYAMA
remove trailing white-spaces from app/models/member_role.rb....
r6382
Jean-Philippe Lang
Allows multiple roles on the same project (#706). Prerequisite for user groups feature....
r2627 validates_presence_of :role
Toshi MARUYAMA
Rails3: model: replace deprecated validate method at member_role model...
r7948 validate :validate_role_member
Jean-Philippe Lang
Merged rails-4.1 branch (#14534)....
r13100 attr_protected :id
Toshi MARUYAMA
remove trailing white-spaces from app/models/member_role.rb....
r6382
Toshi MARUYAMA
Rails3: model: replace deprecated validate method at member_role model...
r7948 def validate_role_member
Jean-Philippe Lang
Allows multiple roles on the same project (#706). Prerequisite for user groups feature....
r2627 errors.add :role_id, :invalid if role && !role.member?
end
Toshi MARUYAMA
remove trailing white-spaces from app/models/member_role.rb....
r6382
Jean-Philippe Lang
Fixed: project copy doesn't copy group memberships (#3975)....
r3136 def inherited?
!inherited_from.nil?
end
Toshi MARUYAMA
remove trailing white-spaces from app/models/member_role.rb....
r6382
Jean-Philippe Lang
Ability to limit member management to certain roles (#19707)....
r13911 # Destroys the MemberRole without destroying its Member if it doesn't have
# any other roles
def destroy_without_member_removal
@member_removal = false
destroy
end
Jean-Philippe Lang
User groups branch merged....
r2755 private
Toshi MARUYAMA
remove trailing white-spaces from app/models/member_role.rb....
r6382
Jean-Philippe Lang
User groups branch merged....
r2755 def remove_member_if_empty
Jean-Philippe Lang
Ability to limit member management to certain roles (#19707)....
r13911 if @member_removal != false && member.roles.empty?
Jean-Philippe Lang
User groups branch merged....
r2755 member.destroy
end
end
Toshi MARUYAMA
remove trailing white-spaces from app/models/member_role.rb....
r6382
Jean-Philippe Lang
User groups branch merged....
r2755 def add_role_to_group_users
Jean-Philippe Lang
Optionaly inherit members from parent project (#5605)....
r11068 if member.principal.is_a?(Group) && !inherited?
Jean-Philippe Lang
User groups branch merged....
r2755 member.principal.users.each do |user|
Jean-Philippe Lang
Optionaly inherit members from parent project (#5605)....
r11068 user_member = Member.find_or_new(member.project_id, user.id)
Jean-Philippe Lang
User groups branch merged....
r2755 user_member.member_roles << MemberRole.new(:role => role, :inherited_from => id)
user_member.save!
end
end
end
Toshi MARUYAMA
remove trailing white-spaces from app/models/member_role.rb....
r6382
Jean-Philippe Lang
Optionaly inherit members from parent project (#5605)....
r11068 def add_role_to_subprojects
member.project.children.each do |subproject|
if subproject.inherit_members?
child_member = Member.find_or_new(subproject.id, member.user_id)
child_member.member_roles << MemberRole.new(:role => role, :inherited_from => id)
child_member.save!
end
end
end
def remove_inherited_roles
Toshi MARUYAMA
remove unneeded Relation#all from MemberRole model...
r12453 MemberRole.where(:inherited_from => id).group_by(&:member).
each do |member, member_roles|
Jean-Philippe Lang
Makes user unwatch what he can no longer view after its permissions have changed (#3589)....
r3053 member_roles.each(&:destroy)
end
Jean-Philippe Lang
User groups branch merged....
r2755 end
Jean-Philippe Lang
Allows multiple roles on the same project (#706). Prerequisite for user groups feature....
r2627 end