hrfee/jfa-go
1
0
Fork 0
mirror of https://github.com/hrfee/jfa-go.git synced 2025-04-01 16:52:52 +00:00
Code Issues Projects Releases Wiki Activity

user: fix welcome message sent value on NewUserFromAdmin

Browse Source 
inverted since WelcomeNewUser returns a bool called "failed", rather
than one indicating success.
This commit is contained in:
Harvey Tindall 2025-03-15 14:53:53 +00:00
parent 58c2fa3dde
commit 41dff3d5bb
Signed by: hrfee
GPG Key ID: BBC65952848FB1A2
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api-users.go
View File

@ -63,7 +63,7 @@ func (app *appContext) NewUserFromAdmin(gc *gin.Context) {
welcomeMessageSentIfNecessary := true welcomeMessageSentIfNecessary := true
if nu.Created { if nu.Created {
welcomeMessageSentIfNecessary = app.WelcomeNewUser(nu.User, time.Time{}) welcomeMessageSentIfNecessary = !app.WelcomeNewUser(nu.User, time.Time{})
} }
respondUser(nu.Status, nu.Created, welcomeMessageSentIfNecessary, nu.Message, gc) respondUser(nu.Status, nu.Created, welcomeMessageSentIfNecessary, nu.Message, gc)

19
ts/modules/accounts.ts
View File

@ -103,7 +103,7 @@ class user implements User, SearchableItem {
set selected(state: boolean) { set selected(state: boolean) {
this._selected = state; this._selected = state;
this._check.checked = state; this._check.checked = state;
state ? document.dispatchEvent(this._checkEvent) : document.dispatchEvent(this._uncheckEvent); state ? document.dispatchEvent(this._checkEvent()) : document.dispatchEvent(this._uncheckEvent());
} }
get name(): string { return this._username.textContent; } get name(): string { return this._username.textContent; }
@ -481,8 +481,8 @@ class user implements User, SearchableItem {
); );
} }
private _checkEvent = new CustomEvent("accountCheckEvent"); private _checkEvent = () => new CustomEvent("accountCheckEvent", {detail: this.id});
private _uncheckEvent = new CustomEvent("accountUncheckEvent"); private _uncheckEvent = () => new CustomEvent("accountUncheckEvent", {detail: this.id});
constructor(user: User) { constructor(user: User) {
this._row = document.createElement("tr") as HTMLTableRowElement; this._row = document.createElement("tr") as HTMLTableRowElement;
@ -696,7 +696,7 @@ class user implements User, SearchableItem {
asElement = (): HTMLTableRowElement => { return this._row; } asElement = (): HTMLTableRowElement => { return this._row; }
remove = () => { remove = () => {
if (this.selected) { if (this.selected) {
document.dispatchEvent(this._uncheckEvent); document.dispatchEvent(this._uncheckEvent());
} }
this._row.remove(); this._row.remove();
} }
@ -927,6 +927,17 @@ export class accountsList {
state ? this._checkCount = count : 0; state ? this._checkCount = count : 0;
} }
selectAllBetweenIDs = (startID: string, endID: string) => {
let inRange = false;
for (let id of this._ordering) {
if (!(inRange || id == startID)) continue;
inRange = true;
if (!(this._table.contains(this._users[id].asElement()))) continue;
this._users[id].selected = true;
if (id == endID) return;
}
}
add = (u: User) => { add = (u: User) => {
let domAccount = new user(u); let domAccount = new user(u);
this._users[u.id] = domAccount; this._users[u.id] = domAccount;