Fix setting default values for user
This commit is contained in:
parent
3fe2558a5c
commit
a51562d6d9
1 changed files with 10 additions and 7 deletions
|
@ -200,17 +200,18 @@ class User < ActiveRecord::Base
|
||||||
end
|
end
|
||||||
|
|
||||||
def build_user(attrs = {}, options= {})
|
def build_user(attrs = {}, options= {})
|
||||||
user = User.new(defaults.merge(attrs), options)
|
if options[:as] == :admin
|
||||||
# if not as: :admin force default settings
|
User.new(defaults.merge(attrs.symbolize_keys), options)
|
||||||
user.with_defaults unless options[:as] == :admin
|
else
|
||||||
user
|
User.new(attrs, options).with_defaults
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def defaults
|
def defaults
|
||||||
{
|
{
|
||||||
projects_limit: Gitlab.config.gitlab.default_projects_limit,
|
projects_limit: Gitlab.config.gitlab.default_projects_limit,
|
||||||
can_create_group: Gitlab.config.gitlab.default_can_create_group,
|
can_create_group: Gitlab.config.gitlab.default_can_create_group,
|
||||||
theme_id: Gitlab::Theme::BASIC
|
theme_id: Gitlab::Theme::MARS
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -384,8 +385,10 @@ class User < ActiveRecord::Base
|
||||||
end
|
end
|
||||||
|
|
||||||
def with_defaults
|
def with_defaults
|
||||||
User.defaults.each do |k,v|
|
User.defaults.each do |k, v|
|
||||||
self.send("#{k}=",v)
|
self.send("#{k}=", v)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
self
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue