Skip to content

Commit 41dff3d

Browse files
committed
user: fix welcome message sent value on NewUserFromAdmin
inverted since WelcomeNewUser returns a bool called "failed", rather than one indicating success.
1 parent 58c2fa3 commit 41dff3d

File tree

2 files changed

+16
-5
lines changed

2 files changed

+16
-5
lines changed

api-users.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ func (app *appContext) NewUserFromAdmin(gc *gin.Context) {
6363

6464
welcomeMessageSentIfNecessary := true
6565
if nu.Created {
66-
welcomeMessageSentIfNecessary = app.WelcomeNewUser(nu.User, time.Time{})
66+
welcomeMessageSentIfNecessary = !app.WelcomeNewUser(nu.User, time.Time{})
6767
}
6868

6969
respondUser(nu.Status, nu.Created, welcomeMessageSentIfNecessary, nu.Message, gc)

ts/modules/accounts.ts

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ class user implements User, SearchableItem {
103103
set selected(state: boolean) {
104104
this._selected = state;
105105
this._check.checked = state;
106-
state ? document.dispatchEvent(this._checkEvent) : document.dispatchEvent(this._uncheckEvent);
106+
state ? document.dispatchEvent(this._checkEvent()) : document.dispatchEvent(this._uncheckEvent());
107107
}
108108

109109
get name(): string { return this._username.textContent; }
@@ -481,8 +481,8 @@ class user implements User, SearchableItem {
481481
);
482482
}
483483

484-
private _checkEvent = new CustomEvent("accountCheckEvent");
485-
private _uncheckEvent = new CustomEvent("accountUncheckEvent");
484+
private _checkEvent = () => new CustomEvent("accountCheckEvent", {detail: this.id});
485+
private _uncheckEvent = () => new CustomEvent("accountUncheckEvent", {detail: this.id});
486486

487487
constructor(user: User) {
488488
this._row = document.createElement("tr") as HTMLTableRowElement;
@@ -696,7 +696,7 @@ class user implements User, SearchableItem {
696696
asElement = (): HTMLTableRowElement => { return this._row; }
697697
remove = () => {
698698
if (this.selected) {
699-
document.dispatchEvent(this._uncheckEvent);
699+
document.dispatchEvent(this._uncheckEvent());
700700
}
701701
this._row.remove();
702702
}
@@ -927,6 +927,17 @@ export class accountsList {
927927
state ? this._checkCount = count : 0;
928928
}
929929

930+
selectAllBetweenIDs = (startID: string, endID: string) => {
931+
let inRange = false;
932+
for (let id of this._ordering) {
933+
if (!(inRange || id == startID)) continue;
934+
inRange = true;
935+
if (!(this._table.contains(this._users[id].asElement()))) continue;
936+
this._users[id].selected = true;
937+
if (id == endID) return;
938+
}
939+
}
940+
930941
add = (u: User) => {
931942
let domAccount = new user(u);
932943
this._users[u.id] = domAccount;

0 commit comments

Comments
 (0)