github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-05 13:24:40 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Revert "DEV: Remove usage of {{action}} modifiers (#18333)" (#18469)

Browse Source 
This reverts commit ba27ee16376c961c93a4e3854b038a42f9577613.

We found some issues with handling of cmd/ctrl/shift + click on `<a` elements
This commit is contained in:
David Taylor
2022-10-04 12:27:26 +01:00
committed by GitHub
parent ba27ee1637
commit 585c584fdb
135 changed files with 730 additions and 929 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/assets/javascripts/admin/addon/controllers/admin-logs-screened-ip-addresses.js
View File

@ -6,7 +6,6 @@ import discourseDebounce from "discourse-common/lib/debounce";
import { exportEntity } from "discourse/lib/export-csv";
import { observes } from "discourse-common/utils/decorators";
import { outputExportResult } from "discourse/lib/export-result";
import { action } from "@ember/object";
import { inject as service } from "@ember/service";
export default Controller.extend({
@ -27,15 +26,6 @@ export default Controller.extend({
discourseDebounce(this, this._debouncedShow, INPUT_DELAY);
},
@action
edit(record, event) {
event?.preventDefault();
if (!record.get("editing")) {
this.set("savedIpAddress", record.get("ip_address"));
}
record.set("editing", true);
},
actions: {
allow(record) {
record.set("action_name", "do_nothing");
@ -47,6 +37,13 @@ export default Controller.extend({
record.save();
},
edit(record) {
if (!record.get("editing")) {
this.set("savedIpAddress", record.get("ip_address"));
}
record.set("editing", true);
},
cancel(record) {
const savedIpAddress = this.savedIpAddress;
if (savedIpAddress && record.get("editing")) {