github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-06 11:54:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #1782 from ligthyear/group-mention

Browse Source 
Allow groups to be used as aliases for user mentions
This commit is contained in:
Sam
2014-01-12 14:36:45 -08:00
parent e20f5f89e6 7cbe92d5b6
commit 2b64118df1
15 changed files with 178 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,16 +16,20 @@ class Admin::GroupsController < Admin::AdminController
def update
group = Group.find(params[:id].to_i)
if group.automatic
can_not_modify_automatic
# we can only change the alias level on automatic groups
group.alias_level = params[:group][:alias_level]
else
group.usernames = params[:group][:usernames]
group.alias_level = params[:group][:alias_level]
group.name = params[:group][:name] if params[:group][:name]
if group.save
render json: success_json
else
render_json_error group
end
end
if group.save
render json: success_json
else
render_json_error group
end
end

8
app/controllers/users_controller.rb
View File

@ -264,7 +264,13 @@ class UsersController < ApplicationController
user_fields = [:username, :use_uploaded_avatar, :upload_avatar_template, :uploaded_avatar_id]
user_fields << :name if SiteSetting.enable_names?
render json: { users: results.as_json(only: user_fields, methods: :avatar_template) }
to_render = { users: results.as_json(only: user_fields, methods: :avatar_template) }
if params[:include_groups] == "true"
to_render[:groups] = Group.search_group(term, current_user).map {|m| {:name=>m.name, :usernames=> m.usernames.split(",")} }
end
render json: to_render
end
# [LEGACY] avatars in quotes/oneboxes might still be pointing to this route