mirror of
https://github.com/discourse/discourse.git
synced 2024-11-22 05:47:45 +08:00
FIX: limit the number of custom flags to 50 (#28221)
Admin can create up to 50 custom flags. It is limited for performance reasons. When the limit is reached "Add button" is disabled and backend is protected by guardian.
This commit is contained in:
parent
2e8273dcb4
commit
fc2259d1c8
|
@ -4,6 +4,7 @@ import { action } from "@ember/object";
|
|||
import { service } from "@ember/service";
|
||||
import { ajax } from "discourse/lib/ajax";
|
||||
import { popupAjaxError } from "discourse/lib/ajax-error";
|
||||
import { SYSTEM_FLAG_IDS } from "discourse/lib/constants";
|
||||
import i18n from "discourse-common/helpers/i18n";
|
||||
import { bind } from "discourse-common/utils/decorators";
|
||||
import AdminConfigHeader from "admin/components/admin-config-header";
|
||||
|
@ -11,8 +12,17 @@ import AdminFlagItem from "admin/components/admin-flag-item";
|
|||
|
||||
export default class AdminConfigAreasFlags extends Component {
|
||||
@service site;
|
||||
@service siteSettings;
|
||||
@tracked flags = this.site.flagTypes;
|
||||
|
||||
get addFlagButtonDisabled() {
|
||||
return (
|
||||
this.flags.filter(
|
||||
(flag) => !Object.values(SYSTEM_FLAG_IDS).includes(flag.id)
|
||||
).length >= this.siteSettings.custom_flags_limit
|
||||
);
|
||||
}
|
||||
|
||||
@bind
|
||||
isFirstFlag(flag) {
|
||||
return this.flags.indexOf(flag) === 1;
|
||||
|
@ -68,6 +78,7 @@ export default class AdminConfigAreasFlags extends Component {
|
|||
@primaryActionCssClass="admin-flags__header-add-flag"
|
||||
@primaryActionIcon="plus"
|
||||
@primaryActionLabel="admin.config_areas.flags.add"
|
||||
@primaryActionDisabled={{this.addFlagButtonDisabled}}
|
||||
/>
|
||||
<table class="admin-flags__items grid">
|
||||
<thead>
|
||||
|
|
|
@ -20,6 +20,7 @@ export default class AdminFlagItem extends Component {
|
|||
"btn-icon-text"
|
||||
@primaryActionCssClass
|
||||
}}
|
||||
@disabled={{@primaryActionDisabled}}
|
||||
>
|
||||
{{dIcon @primaryActionIcon}}
|
||||
{{i18n @primaryActionLabel}}
|
||||
|
|
|
@ -10,6 +10,7 @@ class Flag < ActiveRecord::Base
|
|||
MAX_DESCRIPTION_LENGTH = 1000
|
||||
scope :enabled, -> { where(enabled: true) }
|
||||
scope :system, -> { where("id < 1000") }
|
||||
scope :custom, -> { where("id >= 1000") }
|
||||
|
||||
before_save :set_position
|
||||
before_save :set_name_key
|
||||
|
|
|
@ -2434,6 +2434,10 @@ developer:
|
|||
type: group_list
|
||||
hidden: true
|
||||
allow_any: false
|
||||
custom_flags_limit:
|
||||
default: 50
|
||||
hidden: true
|
||||
client: true
|
||||
|
||||
navigation:
|
||||
navigation_menu:
|
||||
|
|
|
@ -6,7 +6,7 @@ module FlagGuardian
|
|||
end
|
||||
|
||||
def can_create_flag?
|
||||
@user.admin?
|
||||
@user.admin? && Flag.custom.count < SiteSetting.custom_flags_limit
|
||||
end
|
||||
|
||||
def can_toggle_flag?
|
||||
|
|
|
@ -6,6 +6,19 @@ RSpec.describe FlagGuardian do
|
|||
fab!(:moderator)
|
||||
|
||||
after(:each) { Flag.reset_flag_settings! }
|
||||
describe "#can_create_flag?" do
|
||||
it "returns true for admin and when custom flags limit is not reached" do
|
||||
SiteSetting.custom_flags_limit = 1
|
||||
|
||||
expect(Guardian.new(admin).can_create_flag?).to eq(true)
|
||||
expect(Guardian.new(user).can_create_flag?).to eq(false)
|
||||
|
||||
Fabricate(:flag)
|
||||
|
||||
expect(Guardian.new(admin).can_create_flag?).to eq(false)
|
||||
expect(Guardian.new(user).can_create_flag?).to eq(false)
|
||||
end
|
||||
end
|
||||
|
||||
describe "#can_edit_flag?" do
|
||||
it "returns true for admin and false for moderator and regular user" do
|
||||
|
|
|
@ -9,7 +9,10 @@ describe "Admin Flags Page", type: :system do
|
|||
let(:admin_flag_form_page) { PageObjects::Pages::AdminFlagForm.new }
|
||||
let(:flag_modal) { PageObjects::Modals::Flag.new }
|
||||
|
||||
before { sign_in(admin) }
|
||||
before do
|
||||
sign_in(admin)
|
||||
SiteSetting.custom_flags_limit = 1
|
||||
end
|
||||
|
||||
it "allows admin to disable, change order, create, update and delete flags" do
|
||||
# disable
|
||||
|
@ -69,7 +72,11 @@ describe "Admin Flags Page", type: :system do
|
|||
"Something Else",
|
||||
)
|
||||
|
||||
admin_flags_page.visit.click_add_flag
|
||||
admin_flags_page.visit
|
||||
|
||||
expect(admin_flags_page).to have_add_flag_button_enabled
|
||||
|
||||
admin_flags_page.click_add_flag
|
||||
admin_flag_form_page
|
||||
.fill_in_name("Vulgar")
|
||||
.fill_in_description("New flag description")
|
||||
|
@ -87,6 +94,8 @@ describe "Admin Flags Page", type: :system do
|
|||
"Vulgar",
|
||||
)
|
||||
|
||||
expect(admin_flags_page).to have_add_flag_button_disabled
|
||||
|
||||
topic_page.visit_topic(post.topic).open_flag_topic_modal
|
||||
|
||||
expect(flag_modal).to have_choices(
|
||||
|
@ -126,6 +135,8 @@ describe "Admin Flags Page", type: :system do
|
|||
|
||||
expect(admin_flags_page).to have_no_flag("tasteless")
|
||||
|
||||
expect(admin_flags_page).to have_add_flag_button_enabled
|
||||
|
||||
topic_page.visit_topic(post.topic).open_flag_topic_modal
|
||||
|
||||
expect(flag_modal).to have_choices(
|
||||
|
|
|
@ -47,6 +47,14 @@ module PageObjects
|
|||
all(".admin-flag-item__name").map(&:text) == flags
|
||||
end
|
||||
|
||||
def has_add_flag_button_enabled?
|
||||
has_css?(".admin-flags__header-add-flag:not([disabled])")
|
||||
end
|
||||
|
||||
def has_add_flag_button_disabled?
|
||||
has_no_css?(".admin-flags__header-add-flag[disabled]")
|
||||
end
|
||||
|
||||
def has_flag?(flag)
|
||||
has_css?(".admin-flag-item.#{flag}")
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue
Block a user