Discource-C/discourse
1
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-03-04 02:09:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

UX: disable "Queue For Review" button if user can't perform action. (#13966)

Browse Source 
Currently, it's returning JS error when trying to click the button when the action is already performed by the same staff user.
This commit is contained in:
Vinoth Kannan 2021-08-07 12:36:56 +05:30 committed by GitHub
parent 3fdb64184b
commit 8c27e69523
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/assets/javascripts/discourse/app/controllers/flag.js
View File

@ -180,6 +180,13 @@ export default Controller.extend(ModalFunctionality, {
}, },
submitDisabled: not("submitEnabled"), submitDisabled: not("submitEnabled"),
cantFlagForReview: not("notifyModeratorsFlag"),
@discourseComputed("flagsAvailable")
notifyModeratorsFlag(flagsAvailable) {
const notifyModeratorsID = 7;
return flagsAvailable.find((f) => f.id === notifyModeratorsID);
},
// Staff accounts can "take action" // Staff accounts can "take action"
@discourseComputed("flagTopic", "selected.is_custom_flag") @discourseComputed("flagTopic", "selected.is_custom_flag")
@ -289,12 +296,7 @@ export default Controller.extend(ModalFunctionality, {
}, },
flagForReview() { flagForReview() {
const notifyModeratorsID = 7; this.set("selected", this.get("notifyModeratorsFlag"));
const notifyModerators = this.flagsAvailable.find(
(f) => f.id === notifyModeratorsID
);
this.set("selected", notifyModerators);
this.send("createFlag", { queue_for_review: true }); this.send("createFlag", { queue_for_review: true });
this.set("model.hidden", true); this.set("model.hidden", true);
}, },

1
app/assets/javascripts/discourse/app/templates/modal/flag.hbs
View File

@ -44,6 +44,7 @@
{{d-button {{d-button
class="btn-danger" class="btn-danger"
action=(action "flagForReview") action=(action "flagForReview")
disabled=cantFlagForReview
icon="exclamation-triangle" icon="exclamation-triangle"
label="flagging.flag_for_review" label="flagging.flag_for_review"
}} }}