Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: only delete the word/phrase when the 'x' icon is clicked (#13547)

This commit is contained in:
Arpit Jalan 2021-06-28 15:14:18 +05:30 committed by GitHub
parent 6be4699954
commit 3dda926cb2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/admin/addon/components/admin-watched-word.js
View File

@ -2,6 +2,7 @@ import Component from "@ember/component";
import { equal } from "@ember/object/computed"; import { equal } from "@ember/object/computed";
import bootbox from "bootbox"; import bootbox from "bootbox";
import discourseComputed from "discourse-common/utils/decorators"; import discourseComputed from "discourse-common/utils/decorators";
import { action } from "@ember/object";
import I18n from "I18n"; import I18n from "I18n";
export default Component.extend({ export default Component.extend({
@ -16,7 +17,8 @@ export default Component.extend({
return replacement.split(","); return replacement.split(",");
}, },
click() { @action
deleteWord() {
this.word this.word
.destroy() .destroy()
.then(() => { .then(() => {

2
app/assets/javascripts/admin/addon/templates/components/admin-watched-word.hbs
View File

@ -1,4 +1,4 @@
{{d-icon "times"}} {{word.word}} <span role="button" onclick={{action "deleteWord"}} class="delete-word-record">{{d-icon "times"}}</span> {{word.word}}
{{#if (or isReplace isLink)}} {{#if (or isReplace isLink)}}
&rarr; <span class="replacement">{{word.replacement}}</span> &rarr; <span class="replacement">{{word.replacement}}</span>
{{else if isTag}} {{else if isTag}}

2
app/assets/javascripts/discourse/tests/acceptance/admin-watched-words-test.js
View File

@ -82,7 +82,7 @@ acceptance("Admin - Watched Words", function (needs) {
} }
}); });
await click("#" + $(word).attr("id")); await click(`#${$(word).attr("id")} .delete-word-record`);
assert.equal(count(".watched-words-list .watched-word"), 2); assert.equal(count(".watched-words-list .watched-word"), 2);
}); });

6
app/assets/stylesheets/common/admin/staff_logs.scss
View File

@ -377,10 +377,10 @@ table.screened-ip-addresses {
.d-icon { .d-icon {
margin-right: 0.25em; margin-right: 0.25em;
color: var(--primary-medium); color: var(--primary-medium);
}
&:hover .d-icon { &:hover {
color: var(--danger); color: var(--danger);
}
} }
} }