| {{i18n "groups.members.owner"}} | ++ {{flat-button class="bulk-select" icon="list" action=(action "toggleBulkSelect") title="topics.bulk.toggle"}} + | + {{#if isBulk}} ++ {{d-button action=(action "bulkSelectAll") label="topics.bulk.select_all"}} + {{d-button action=(action "bulkClearAll") label="topics.bulk.clear_all"}} + | + {{/if}} + {{table-header-toggle order=order asc=asc field="username_lower" labelKey="username" class="username"}} +{{table-header-toggle order=order asc=asc field="added_at" labelKey="groups.member_added"}} {{table-header-toggle order=order asc=asc field="last_posted_at" labelKey="last_post"}} {{table-header-toggle order=order asc=asc field="last_seen_at" labelKey="last_seen"}} - | + | + {{#if isBulk}} + {{group-member-dropdown + bulkSelection=bulkSelection + canAdminGroup=model.can_admin_group + onChange=(action "actOnSelection" bulkSelection) + }} + {{/if}} + | {{#each model.members as |m|}}
|---|---|---|---|---|---|
| + {{#if isBulk}} + | + {{input type="checkbox" class="bulk-select" click=(action "selectMember" m)}} + | + {{/if}} + +{{user-info user=m skipName=skipName}} |
{{#if m.owner}}
-
- {{d-icon "shield-alt"}}
-
+ {{d-icon "shield-alt"}} {{i18n "groups.members.owner"}} + {{/if}} + {{#if m.primary}} + {{i18n "groups.members.primary"}} {{/if}} |
diff --git a/app/assets/javascripts/discourse/tests/acceptance/group-index-test.js b/app/assets/javascripts/discourse/tests/acceptance/group-index-test.js index 524af365e59..1c2872c52f3 100644 --- a/app/assets/javascripts/discourse/tests/acceptance/group-index-test.js +++ b/app/assets/javascripts/discourse/tests/acceptance/group-index-test.js @@ -6,6 +6,7 @@ import { } from "discourse/tests/helpers/qunit-helpers"; import { click, visit } from "@ember/test-helpers"; import I18n from "I18n"; +import selectKit from "discourse/tests/helpers/select-kit-helper"; import { test } from "qunit"; acceptance("Group Members - Anonymous", function () { @@ -34,6 +35,12 @@ acceptance("Group Members - Anonymous", function () { acceptance("Group Members", function (needs) { needs.user(); + needs.pretender((server, helper) => { + server.put("/admin/groups/47/owners.json", () => { + return helper.response({ success: true }); + }); + }); + test("Viewing Members as a group owner", async function (assert) { updateCurrentUser({ moderator: false, admin: false }); @@ -61,4 +68,18 @@ acceptance("Group Members", function (needs) { "it should display the right filter placehodler" ); }); + + test("Shows bulk actions", async function (assert) { + await visit("/g/discourse"); + + assert.ok(count("button.bulk-select") > 0); + await click("button.bulk-select"); + + await click("input.bulk-select:nth(0)"); + await click("input.bulk-select:nth(1)"); + + const memberDropdown = selectKit(".group-member-dropdown:first"); + await memberDropdown.expand(); + await memberDropdown.selectRowByValue("makeOwners"); + }); }); diff --git a/app/assets/javascripts/discourse/tests/acceptance/group-manage-membership-test.js b/app/assets/javascripts/discourse/tests/acceptance/group-manage-membership-test.js index 5a955e12c92..afef5e560c2 100644 --- a/app/assets/javascripts/discourse/tests/acceptance/group-manage-membership-test.js +++ b/app/assets/javascripts/discourse/tests/acceptance/group-manage-membership-test.js @@ -50,6 +50,11 @@ acceptance("Managing Group Membership", function (needs) { "it should disable group allow_membership_request input" ); + assert.ok( + queryAll(".group-flair-inputs").length === 1, + "it should display avatar flair inputs" + ); + await click(".group-form-public-admission"); await click(".group-form-allow-membership-requests"); diff --git a/app/assets/javascripts/discourse/tests/acceptance/group-manage-profile-test.js b/app/assets/javascripts/discourse/tests/acceptance/group-manage-profile-test.js index 67785934d18..7a0ced08025 100644 --- a/app/assets/javascripts/discourse/tests/acceptance/group-manage-profile-test.js +++ b/app/assets/javascripts/discourse/tests/acceptance/group-manage-profile-test.js @@ -24,10 +24,6 @@ acceptance("Managing Group Profile", function (needs) { test("As an admin", async function (assert) { await visit("/g/discourse/manage/profile"); - assert.ok( - queryAll(".group-flair-inputs").length === 1, - "it should display avatar flair inputs" - ); assert.ok( queryAll(".group-form-bio").length === 1, "it should display group bio input" diff --git a/app/assets/stylesheets/common/base/group.scss b/app/assets/stylesheets/common/base/group.scss index 3ecab3780be..cf5750b2676 100644 --- a/app/assets/stylesheets/common/base/group.scss +++ b/app/assets/stylesheets/common/base/group.scss @@ -107,39 +107,48 @@ table.group-members { width: 100%; table-layout: fixed; - th:first-child { - width: 30%; - text-align: left; - } - - th:last-child { - width: 5%; - } - - th.group-members-actions { - width: 5%; - } - th { text-align: center; + + &.bulk-select { + height: 30px; + width: 30px; + } + + &.bulk-select-buttons { + text-align: left; + width: 20%; + } + + &.username { + text-align: left; + width: 30%; + } + + &.bulk-select-buttons + .username { + width: 10%; + } + + &.group-members-actions { + width: 5%; + } } - tr { - .user-info { - display: block; - .avatar-flair { - color: var(--primary); - } - } + td { + color: var(--primary-medium); + padding: 0.8em 0; + text-align: center; - td:first-child { + &.avatar { text-align: left; } + } - td { - text-align: center; - color: var(--primary-medium); - padding: 0.8em 0; + .user-info { + display: block; + + .avatar-flair { + color: var(--primary); } } } diff --git a/app/controllers/admin/groups_controller.rb b/app/controllers/admin/groups_controller.rb index e3bae016792..eba7042ba10 100644 --- a/app/controllers/admin/groups_controller.rb +++ b/app/controllers/admin/groups_controller.rb @@ -125,15 +125,35 @@ class Admin::GroupsController < Admin::AdminController return can_not_modify_automatic if group.automatic guardian.ensure_can_edit_group!(group) - user = User.find(params[:user_id].to_i) - group.group_users.where(user_id: user.id).update_all(owner: false) - GroupActionLogger.new(current_user, group).log_remove_user_as_group_owner(user) + if params[:user_id].present? + users = [User.find_by(id: params[:user_id].to_i)] + elsif usernames = group_params[:usernames].presence + users = User.where(username: usernames.split(",")) + else + raise Discourse::InvalidParameters.new(:user_id) + end + + users.each do |user| + group.group_users.where(user_id: user.id).update_all(owner: false) + GroupActionLogger.new(current_user, group).log_remove_user_as_group_owner(user) + end Group.reset_counters(group.id, :group_users) render json: success_json end + def set_primary + group = Group.find_by(id: params.require(:id)) + raise Discourse::NotFound unless group + + users = User.where(username: group_params[:usernames].split(",")) + users.each { |user| guardian.ensure_can_change_primary_group!(user) } + users.update_all(primary_group_id: params[:primary] == "true" ? group.id : nil) + + render json: success_json + end + def automatic_membership_count domains = Group.get_valid_email_domains(params.require(:automatic_membership_email_domains)) group_id = params[:id] diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index a514203f011..6b4b3cfed7e 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -785,7 +785,22 @@ en: make_owner_description: "Make %{username} an owner of this group" remove_owner: "Remove as Owner" remove_owner_description: "Remove %{username} as an owner of this group" + make_primary: "Make Primary" + make_primary_description: "Make this the primary group for %{username}" + remove_primary: "Remove as Primary" + remove_primary_description: "Remove this as the primary group for %{username}" + remove_members: "Remove Members" + remove_members_description: "Remove selected users from this group" + make_owners: "Make Owners" + make_owners_description: "Make selected users owners of this group" + remove_owners: "Remove Owners" + remove_owners_description: "Remove selected users as owners of this group" + make_all_primary: "Make All Primary" + make_all_primary_description: "Make this the primary group for all selected users" + remove_all_primary: "Remove as Primary" + remove_all_primary_description: "Remove this group as primary" owner: "Owner" + primary: "Primary" forbidden: "You're not allowed to view the members." topics: "Topics" posts: "Posts" diff --git a/config/routes.rb b/config/routes.rb index 85c40920445..dd704accb53 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -95,6 +95,7 @@ Discourse::Application.routes.draw do member do put "owners" => "groups#add_owners" delete "owners" => "groups#remove_owner" + put "primary" => "groups#set_primary" end end resources :groups, except: [:create], constraints: AdminConstraint.new do diff --git a/spec/requests/admin/groups_controller_spec.rb b/spec/requests/admin/groups_controller_spec.rb index 2181cb38370..03a606e2367 100644 --- a/spec/requests/admin/groups_controller_spec.rb +++ b/spec/requests/admin/groups_controller_spec.rb @@ -157,6 +157,9 @@ RSpec.describe Admin::GroupsController do end describe '#remove_owner' do + let(:user2) { Fabricate(:user) } + let(:user3) { Fabricate(:user) } + it 'should work' do group.add_owner(user) @@ -168,6 +171,20 @@ RSpec.describe Admin::GroupsController do expect(group.group_users.where(owner: true)).to eq([]) end + it 'should work with multiple users' do + group.add_owner(user) + group.add_owner(user3) + + delete "/admin/groups/#{group.id}/owners.json", params: { + group: { + usernames: "#{user.username},#{user2.username},#{user3.username}" + } + } + + expect(response.status).to eq(200) + expect(group.group_users.where(owner: true)).to eq([]) + end + it 'returns not-found error when there is no group' do group.destroy! @@ -190,6 +207,36 @@ RSpec.describe Admin::GroupsController do end end + describe "#set_primary" do + let(:user2) { Fabricate(:user) } + let(:user3) { Fabricate(:user) } + + it 'sets with multiple users' do + user2.update!(primary_group_id: group.id) + + put "/admin/groups/#{group.id}/primary.json", params: { + group: { usernames: "#{user.username},#{user2.username},#{user3.username}" }, + primary: "true" + } + + expect(response.status).to eq(200) + expect(User.where(primary_group_id: group.id).size).to eq(3) + end + + it 'unsets with multiple users' do + user.update!(primary_group_id: group.id) + user3.update!(primary_group_id: group.id) + + put "/admin/groups/#{group.id}/primary.json", params: { + group: { usernames: "#{user.username},#{user2.username},#{user3.username}" }, + primary: "false" + } + + expect(response.status).to eq(200) + expect(User.where(primary_group_id: group.id).size).to eq(0) + end + end + describe "#bulk_perform" do fab!(:group) do Fabricate(:group, | |