mirror of
https://github.com/discourse/discourse.git
synced 2026-08-04 10:39:43 +08:00
Followup 5823e4e3b2,
this commit allows the addition of users along with
groups to access control lists, modifying DAccessControl
to support selecting a user or group from the same
search input.
Shown here is a mix of user & group permissions in the
`DAccessControl` component:
<img width="611" height="664" alt="image"
src="https://github.com/user-attachments/assets/c25e13b0-8885-4ce7-972c-5116f3acb094"
/>
When the search opens, we show the site's groups that
the user can see as preloaded values, showing only the
group name for clarity:
<img width="612" height="389" alt="image"
src="https://github.com/user-attachments/assets/df93a94b-918e-4fed-b045-ac72f02aca41"
/>
When searching a GET request is sent and users are included
in search results.
<img width="608" height="404" alt="image"
src="https://github.com/user-attachments/assets/ff17e6c0-2505-480e-ae25-e6f8309555bc"
/>
---------
Co-authored-by: Jordan Vidrine <jordan@jordanvidrine.com>
14 lines
372 B
Ruby
Vendored
14 lines
372 B
Ruby
Vendored
# frozen_string_literal: true
|
|
|
|
class FoundGroupSerializer < ApplicationSerializer
|
|
attributes :id, :automatic, :name, :full_name, :display_name
|
|
|
|
def display_name
|
|
if object.automatic
|
|
auto_group_name = Group::AUTO_GROUP_IDS[object.id]
|
|
I18n.t("groups.default_full_names.#{auto_group_name}")
|
|
else
|
|
object.full_name || object.name
|
|
end
|
|
end
|
|
end
|