IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-23 01:16:38 -06:00
Code Issues Packages Projects Releases Wiki Activity

DEV: rename refresh action to avoid regressions in the future (#14721)

Browse Source
This commit is contained in:
Andrei Prigorshnev 2021-10-27 14:53:04 +04:00 committed by GitHub
parent 19d95c64af
commit 7f79727090
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/app/controllers/tags-index.js
View File

@ -96,7 +96,7 @@ export default Controller.extend({
(proceed) => {
if (proceed) {
ajax("/tags/unused", { type: "DELETE" })
.then(() => this.send("refresh"))
.then(() => this.send("triggerRefresh"))
.catch(popupAjaxError);
}
}

26
app/assets/javascripts/discourse/app/routes/tags-index.js
View File

@ -1,6 +1,7 @@
import DiscourseRoute from "discourse/routes/discourse";
import I18n from "I18n";
import Tag from "discourse/models/tag";
import { action } from "@ember/object";
export default DiscourseRoute.extend({
model() {
@ -34,19 +35,20 @@ export default DiscourseRoute.extend({
});
},
actions: {
didTransition() {
this.controllerFor("application").set("showFooter", true);
return true;
},
@action
didTransition() {
this.controllerFor("application").set("showFooter", true);
return true;
},
showTagGroups() {
this.transitionTo("tagGroups");
return true;
},
@action
showTagGroups() {
this.transitionTo("tagGroups");
return true;
},
refresh() {
this.refresh();
},
@action
triggerRefresh() {
this.refresh();
},
});

2
app/assets/javascripts/discourse/app/templates/modal/tag-upload.hbs
View File

@ -1,3 +1,3 @@
{{#d-modal-body title="tagging.upload"}}
{{tags-uploader refresh=(route-action "refresh") closeModal=(route-action "closeModal")}}
{{tags-uploader refresh=(route-action "triggerRefresh") closeModal=(route-action "closeModal")}}
{{/d-modal-body}}