beenull/Picsur
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fix prefeneces

Browse source
This commit is contained in:
rubikscraft 2022-04-01 13:30:15 +02:00
parent 7c7e23696d
commit 805ff8ab0e
No known key found for this signature in database
GPG key ID: 1463EBE9200A5CD4
6 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
backend/src/models/entities/syspreference.entity.ts
View file

@ -4,7 +4,7 @@ import { Column, Entity, Index, PrimaryGeneratedColumn } from 'typeorm';
@Entity() @Entity()
export class ESysPreferenceBackend extends ESysPreference { export class ESysPreferenceBackend extends ESysPreference {
@PrimaryGeneratedColumn("uuid") @PrimaryGeneratedColumn("uuid")
override id: string; override id?: string;
@Index() @Index()
@Column({ nullable: false, unique: true }) @Column({ nullable: false, unique: true })

2
backend/src/models/entities/usrpreference.entity.ts
View file

@ -3,7 +3,7 @@ import { Column, Index, PrimaryGeneratedColumn } from 'typeorm';
export class EUsrPreferenceBackend extends EUsrPreference { export class EUsrPreferenceBackend extends EUsrPreference {
@PrimaryGeneratedColumn("uuid") @PrimaryGeneratedColumn("uuid")
override id: string; override id?: string;
@Index() @Index()
@Column({ nullable: false, unique: true }) @Column({ nullable: false, unique: true })

5
frontend/src/app/routes/settings/syspref/syspref-option/settings-syspref-option.component.ts
View file

@ -66,7 +66,10 @@ export class SettingsSysprefOptionComponent implements OnInit {
} }
numberUpdateWrapper(e: Event) { numberUpdateWrapper(e: Event) {
this.update((e.target as HTMLInputElement).valueAsNumber); const value = (e.target as HTMLInputElement).valueAsNumber;
if (isNaN(value)) return;
this.update(value);
} }
private async updatePreference(value: PrefValueType) { private async updatePreference(value: PrefValueType) {

6
shared/src/entities/syspreference.entity.ts
View file

@ -1,9 +1,9 @@
import { IsNotEmpty, IsString } from 'class-validator'; import { IsNotEmpty, IsString } from 'class-validator';
import { EntityID } from '../validators/entity-id.validator'; import { EntityIDOptional } from '../validators/entity-id.validator';
export class ESysPreference { export class ESysPreference {
@EntityID() @EntityIDOptional()
id: string; id?: string;
@IsNotEmpty() @IsNotEmpty()
@IsString() @IsString()

6
shared/src/entities/usrpreference.ts
View file

@ -1,10 +1,10 @@
import { IsDefined, IsNotEmpty, IsString } from 'class-validator'; import { IsDefined, IsNotEmpty, IsString } from 'class-validator';
import { EntityID } from '../validators/entity-id.validator'; import { EntityIDOptional } from '../validators/entity-id.validator';
import { IsPosInt } from '../validators/positive-int.validator'; import { IsPosInt } from '../validators/positive-int.validator';
export class EUsrPreference { export class EUsrPreference {
@EntityID() @EntityIDOptional()
id: string; id?: string;
@IsNotEmpty() @IsNotEmpty()
@IsString() @IsString()

3
shared/src/validators/entity-id.validator.ts
View file

@ -1,4 +1,5 @@
import { IsNotEmpty, IsUUID } from 'class-validator'; import { IsNotEmpty, IsOptional, IsUUID } from 'class-validator';
import { CombinePDecorators } from '../util/decorator'; import { CombinePDecorators } from '../util/decorator';
export const EntityID = CombinePDecorators(IsNotEmpty(), IsUUID('4')); export const EntityID = CombinePDecorators(IsNotEmpty(), IsUUID('4'));
export const EntityIDOptional = CombinePDecorators(IsOptional(), IsUUID('4'));