banquise/pelican-panel-mirror
3
0
Fork 1
mirror of https://github.com/pelican-dev/panel.git synced 2025-05-20 00:34:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add missing user timezone stuff (#446)

Browse Source
This commit is contained in:
Boy132 2024-06-29 23:42:46 +02:00 committed by GitHub
parent 82c0568129
commit 133b94ab08
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Http/Requests/Api/Application/Users/StoreUserRequest.php
View File

@ -25,6 +25,7 @@ class StoreUserRequest extends ApplicationApiRequest
'username', 'username',
'password', 'password',
'language', 'language',
'timezone',
'root_admin', 'root_admin',
])->toArray(); ])->toArray();

6
app/Models/User.php
View File

@ -5,6 +5,7 @@ namespace App\Models;
use App\Exceptions\DisplayException; use App\Exceptions\DisplayException;
use App\Rules\Username; use App\Rules\Username;
use App\Facades\Activity; use App\Facades\Activity;
use DateTimeZone;
use Filament\Models\Contracts\FilamentUser; use Filament\Models\Contracts\FilamentUser;
use Filament\Models\Contracts\HasAvatar; use Filament\Models\Contracts\HasAvatar;
use Filament\Models\Contracts\HasName; use Filament\Models\Contracts\HasName;
@ -38,6 +39,7 @@ use App\Notifications\SendPasswordReset as ResetPasswordNotification;
* @property string $password * @property string $password
* @property string|null $remember_token * @property string|null $remember_token
* @property string $language * @property string $language
* @property string $timezone
* @property bool $root_admin * @property bool $root_admin
* @property bool $use_totp * @property bool $use_totp
* @property string|null $totp_secret * @property string|null $totp_secret
@ -70,6 +72,7 @@ use App\Notifications\SendPasswordReset as ResetPasswordNotification;
* @method static Builder|User whereGravatar($value) * @method static Builder|User whereGravatar($value)
* @method static Builder|User whereId($value) * @method static Builder|User whereId($value)
* @method static Builder|User whereLanguage($value) * @method static Builder|User whereLanguage($value)
* @method static Builder|User whereTimezone($value)
* @method static Builder|User whereNameFirst($value) * @method static Builder|User whereNameFirst($value)
* @method static Builder|User whereNameLast($value) * @method static Builder|User whereNameLast($value)
* @method static Builder|User wherePassword($value) * @method static Builder|User wherePassword($value)
@ -144,6 +147,7 @@ class User extends Model implements AuthenticatableContract, AuthorizableContrac
'external_id' => null, 'external_id' => null,
'root_admin' => false, 'root_admin' => false,
'language' => 'en', 'language' => 'en',
'timezone' => 'UTC',
'use_totp' => false, 'use_totp' => false,
'totp_secret' => null, 'totp_secret' => null,
'name_first' => '', 'name_first' => '',
@ -164,6 +168,7 @@ class User extends Model implements AuthenticatableContract, AuthorizableContrac
'password' => 'sometimes|nullable|string', 'password' => 'sometimes|nullable|string',
'root_admin' => 'boolean', 'root_admin' => 'boolean',
'language' => 'string', 'language' => 'string',
'timezone' => 'string',
'use_totp' => 'boolean', 'use_totp' => 'boolean',
'totp_secret' => 'nullable|string', 'totp_secret' => 'nullable|string',
'oauth' => 'array|nullable', 'oauth' => 'array|nullable',
@ -210,6 +215,7 @@ class User extends Model implements AuthenticatableContract, AuthorizableContrac
$rules = parent::getRules(); $rules = parent::getRules();
$rules['language'][] = new In(array_keys((new self())->getAvailableLanguages())); $rules['language'][] = new In(array_keys((new self())->getAvailableLanguages()));
$rules['timezone'][] = new In(array_values(DateTimeZone::listIdentifiers()));
$rules['username'][] = new Username(); $rules['username'][] = new Username();
return $rules; return $rules;