github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-24 01:32:42 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Minor Admin bug with a setting when creating a new group

Browse Source
This commit is contained in:
Régis Hanol
2015-01-23 20:31:48 +01:00
parent 0500638900
commit f7f5e39f75
5 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/controllers/admin/groups_controller.rb
View File

@ -23,6 +23,7 @@ class Admin::GroupsController < Admin::AdminController
group = Group.new
group.name = (params[:name] || '').strip
group.alias_level = params[:alias_level].to_i if params[:alias_level].present?
group.visible = params[:visible] == "true"
group.automatic_membership_email_domains = params[:automatic_membership_email_domains]
group.automatic_membership_retroactive = params[:automatic_membership_retroactive] == "true"
@ -37,12 +38,12 @@ class Admin::GroupsController < Admin::AdminController
def update
group = Group.find(params[:id])
# group rename is ignored for automatic groups
group.name = params[:name] if params[:name] && !group.automatic
group.alias_level = params[:alias_level].to_i if params[:alias_level].present?
group.visible = params[:visible] == "true"
group.automatic_membership_email_domains = params[:automatic_membership_email_domains]
group.automatic_membership_retroactive = params[:automatic_membership_retroactive] == "true"
# group rename is ignored for automatic groups
group.name = params[:name] if params[:name] && !group.automatic
if group.save
render_serialized(group, BasicGroupSerializer)