github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-29 10:55:25 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: do not overrider trigger when equals 0 (#29269)

Browse Source 
This commit is fixing the path which sets a default value to trigger. We were doing `if (!this.model.trigger)` but `this.model.trigger` can have `0` as value, which would trigger this codepath and this codepath was setting the first value of `badgeTriggers` as a default value for trigger.
This commit is contained in:
Joffrey JAFFEUX 2024-10-18 08:34:34 +09:00 committed by GitHub
parent faa9489245
commit fdd4804a8d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/assets/javascripts/admin/addon/controllers/admin-badges/show.js
View File

@ -2,6 +2,7 @@ import { cached, tracked } from "@glimmer/tracking";
import Controller, { inject as controller } from "@ember/controller"; import Controller, { inject as controller } from "@ember/controller";
import { action, getProperties } from "@ember/object"; import { action, getProperties } from "@ember/object";
import { service } from "@ember/service"; import { service } from "@ember/service";
import { isNone } from "@ember/utils";
import { ajax } from "discourse/lib/ajax"; import { ajax } from "discourse/lib/ajax";
import { popupAjaxError } from "discourse/lib/ajax-error"; import { popupAjaxError } from "discourse/lib/ajax-error";
import getURL from "discourse-common/lib/get-url"; import getURL from "discourse-common/lib/get-url";
@ -83,15 +84,15 @@ export default class AdminBadgesShowController extends Controller {
// this is needed because the model doesnt have default values // this is needed because the model doesnt have default values
// Using `set` here isn't ideal, but we don't know that tracking is set up on the model yet. // Using `set` here isn't ideal, but we don't know that tracking is set up on the model yet.
if (this.model) { if (this.model) {
if (!this.model.badge_type_id) { if (isNone(this.model.badge_type_id)) {
this.model.set("badge_type_id", this.badgeTypes?.[0]?.id); this.model.set("badge_type_id", this.badgeTypes?.[0]?.id);
} }
if (!this.model.badge_grouping_id) { if (isNone(this.model.badge_grouping_id)) {
this.model.set("badge_grouping_id", this.badgeGroupings?.[0]?.id); this.model.set("badge_grouping_id", this.badgeGroupings?.[0]?.id);
} }
if (!this.model.trigger) { if (isNone(this.model.trigger)) {
this.model.set("trigger", this.badgeTriggers?.[0]?.id); this.model.set("trigger", this.badgeTriggers?.[0]?.id);
} }
} }

5
app/assets/javascripts/discourse/app/form-kit/components/fk/control/select/option.gjs
View File

@ -1,12 +1,11 @@
import Component from "@glimmer/component"; import Component from "@glimmer/component";
import { isNone } from "@ember/utils";
import { eq } from "truth-helpers"; import { eq } from "truth-helpers";
import { NO_VALUE_OPTION } from "discourse/form-kit/lib/constants"; import { NO_VALUE_OPTION } from "discourse/form-kit/lib/constants";
export default class FKControlSelectOption extends Component { export default class FKControlSelectOption extends Component {
get value() { get value() {
return typeof this.args.value === "undefined" return isNone(this.args.value) ? NO_VALUE_OPTION : this.args.value;
? NO_VALUE_OPTION
: this.args.value;
} }
<template> <template>

12
spec/system/admin_badges_spec.rb
View File

@ -92,6 +92,18 @@ describe "Admin Badges Page", type: :system do
expect(badges_page.form.field("auto_revoke")).to be_unchecked expect(badges_page.form.field("auto_revoke")).to be_unchecked
expect(badges_page.form.field("target_posts")).to be_unchecked expect(badges_page.form.field("target_posts")).to be_unchecked
end end
context "when trigger is 0" do
fab!(:badge) do
Fabricate(:badge, enabled: true, icon: "trick-medial", query: "a query", trigger: 0)
end
it "doesn't override the trigger value" do
badges_page.visit_page(badge.id)
expect(badges_page.form.field("trigger").value).to eq("0")
end
end
end end
context "when deleting a badge" do context "when deleting a badge" do