IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2026-08-08 12:08:12 -05:00
Code Issues Packages Projects Releases Wiki Activity

DEV: refactor CanCheckEmailsHelper to directly take model id (#32129)

Browse Source 
We only need the `model.id` input here, so this simplifies the arguments
being passed into this helper.
This commit is contained in:
Kelv
2025-04-03 20:33:15 +08:00
committed by GitHub
parent 1b2cf92d4c
commit 0863a42ff0
6 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/assets/javascripts/admin/addon/controllers/admin-user-index.js
+2 -2
View File
@@ -133,7 +133,7 @@ export default class AdminUserIndexController extends Controller {
@computed("model.id", "currentUser.id")
get canCheckEmails() {
return new CanCheckEmailsHelper(
this.model,
this.model.id,
this.canModeratorsViewEmails,
this.currentUser
).canCheckEmails;
@@ -142,7 +142,7 @@ export default class AdminUserIndexController extends Controller {
@computed("model.id", "currentUser.id")
get canAdminCheckEmails() {
return new CanCheckEmailsHelper(
this.model,
this.model.id,
this.canModeratorsViewEmails,
this.currentUser
).canAdminCheckEmails;
app/assets/javascripts/admin/addon/controllers/admin-users-list-show.js
+2 -2
View File
@@ -66,7 +66,7 @@ export default class AdminUsersListShowController extends Controller {
@computed("model.id", "currentUser.id")
get canCheckEmails() {
return new CanCheckEmailsHelper(
this.model,
this.model?.id,
this.canModeratorsViewEmails,
this.currentUser
).canCheckEmails;
@@ -75,7 +75,7 @@ export default class AdminUsersListShowController extends Controller {
@computed("model.id", "currentUser.id")
get canAdminCheckEmails() {
return new CanCheckEmailsHelper(
this.model,
this.model?.id,
this.canModeratorsViewEmails,
this.currentUser
).canAdminCheckEmails;
app/assets/javascripts/discourse/app/controllers/preferences/account.js
+1 -1
View File
@@ -57,7 +57,7 @@ export default class AccountController extends Controller {
@computed("model.id", "currentUser.id")
get canCheckEmails() {
return new CanCheckEmailsHelper(
this.model,
this.model.id,
this.canModeratorsViewEmails,
this.currentUser
).canCheckEmails;
app/assets/javascripts/discourse/app/controllers/preferences/security.js
+1 -1
View File
@@ -35,7 +35,7 @@ export default class SecurityController extends Controller {
@computed("model.id", "currentUser.id")
get canCheckEmails() {
return new CanCheckEmailsHelper(
this.model,
this.model.id,
this.canModeratorsViewEmails,
this.currentUser
).canCheckEmails;
app/assets/javascripts/discourse/app/controllers/user.js
+1 -1
View File
@@ -196,7 +196,7 @@ export default class UserController extends Controller {
@computed("model.id", "currentUser.id")
get canCheckEmails() {
return new CanCheckEmailsHelper(
this.model,
this.model.id,
this.canModeratorsViewEmails,
this.currentUser
).canCheckEmails;
app/assets/javascripts/discourse/app/lib/can-check-emails-helper.js
+3 -3
View File
@@ -1,6 +1,6 @@
export default class CanCheckEmailsHelper {
constructor(model, can_moderators_view_emails, currentUser) {
this.model = model;
constructor(model_id, can_moderators_view_emails, currentUser) {
this.model_id = model_id;
this.can_moderators_view_emails = can_moderators_view_emails;
this.currentUser = currentUser;
}
@@ -18,7 +18,7 @@ export default class CanCheckEmailsHelper {
const canStaffCheckEmails =
this.can_moderators_view_emails && this.currentUser.staff;
return (
this.model?.id === this.currentUser.id ||
this.model_id === this.currentUser.id ||
this.canAdminCheckEmails ||
canStaffCheckEmails
);