Patched by Mischa The Evil. git-svn-id: http://svn.redmine.org/redmine/trunk@16753 e93f8b46-1217-0410-a6f0-8f06a7374b81tags/4.0.0
@@ -354,7 +354,7 @@ class Mailer < ActionMailer::Base | |||
:subject => "[#{Setting.app_title}] #{l(:mail_subject_security_notification)}" | |||
end | |||
# Notifies admins about settings changes | |||
# Notifies admins about settings changes | |||
def self.security_settings_updated(changes) | |||
return unless changes.present? | |||
@@ -31,7 +31,7 @@ class Member < ActiveRecord::Base | |||
scope :active, lambda { joins(:principal).where(:users => {:status => Principal::STATUS_ACTIVE})} | |||
# Sort by first role and principal | |||
# Sort by first role and principal | |||
scope :sorted, lambda { | |||
includes(:member_roles, :roles, :principal). | |||
reorder("#{Role.table_name}.position"). |
@@ -527,8 +527,8 @@ class Project < ActiveRecord::Base | |||
member | |||
end | |||
# Default role that is given to non-admin users that | |||
# create a project | |||
# Default role that is given to non-admin users that | |||
# create a project | |||
def self.default_member_role | |||
Role.givable.find_by_id(Setting.new_project_user_role_id.to_i) || Role.givable.first | |||
end |
@@ -118,7 +118,7 @@ class Setting < ActiveRecord::Base | |||
setting.value | |||
end | |||
# Updates multiple settings from params and sends a security notification if needed | |||
# Updates multiple settings from params and sends a security notification if needed | |||
def self.set_all_from_params(settings) | |||
return nil unless settings.is_a?(Hash) | |||
settings = settings.dup.symbolize_keys |
@@ -173,11 +173,11 @@ | |||
-webkit-transform: scale(1,.8); | |||
-ms-transform: scale(1,.8); | |||
transform: scale(1,.8); | |||
padding-top:8px; | |||
padding-top:8px; | |||
} | |||
#project-jump .drdn-content { | |||
position:absolute; | |||
position:absolute; | |||
left:0px; | |||
top:64px; | |||
width:100%; | |||
@@ -186,7 +186,7 @@ | |||
} | |||
#project-jump .drdn-content .autocomplete { | |||
height:40px; | |||
font-size:20px; | |||
font-size:20px; | |||
} | |||
#project-jump .drdn-content a { | |||
padding:8px; |