diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2023-02-09 18:01:15 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2023-02-09 18:01:15 +0900 |
| commit | 39e269db8c7ee8abd2aeba1ecbd9b2caa415aa5b (patch) | |
| tree | db5ece8e52e745d04d5f378b029f0a7e2a246198 /packages | |
| parent | fix(client): validate url to improve security (diff) | |
| parent | fix: dateの初期値が正常に入らない時がある (#9827) (diff) | |
| download | misskey-39e269db8c7ee8abd2aeba1ecbd9b2caa415aa5b.tar.gz misskey-39e269db8c7ee8abd2aeba1ecbd9b2caa415aa5b.tar.bz2 misskey-39e269db8c7ee8abd2aeba1ecbd9b2caa415aa5b.zip | |
Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/frontend/src/components/MkInput.vue | 2 | ||||
| -rw-r--r-- | packages/frontend/src/pages/admin/ads.vue | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/packages/frontend/src/components/MkInput.vue b/packages/frontend/src/components/MkInput.vue index 5c5151fce6..e3f68caa9b 100644 --- a/packages/frontend/src/components/MkInput.vue +++ b/packages/frontend/src/components/MkInput.vue @@ -42,7 +42,7 @@ import { i18n } from '@/i18n'; const props = defineProps<{ modelValue: string | number; - type?: 'text' | 'number' | 'password' | 'email' | 'url' | 'date' | 'time' | 'search'; + type?: 'text' | 'number' | 'password' | 'email' | 'url' | 'date' | 'time' | 'search' | 'datetime-local'; required?: boolean; readonly?: boolean; disabled?: boolean; diff --git a/packages/frontend/src/pages/admin/ads.vue b/packages/frontend/src/pages/admin/ads.vue index 5f711e3e4f..4d6f32f9a9 100644 --- a/packages/frontend/src/pages/admin/ads.vue +++ b/packages/frontend/src/pages/admin/ads.vue @@ -29,7 +29,7 @@ <MkInput v-model="ad.ratio" type="number"> <template #label>{{ i18n.ts.ratio }}</template> </MkInput> - <MkInput v-model="ad.expiresAt" type="date"> + <MkInput v-model="ad.expiresAt" type="datetime-local"> <template #label>{{ i18n.ts.expiration }}</template> </MkInput> </FormSplit> @@ -61,7 +61,12 @@ import { definePageMetadata } from '@/scripts/page-metadata'; let ads: any[] = $ref([]); os.api('admin/ad/list').then(adsResponse => { - ads = adsResponse; + ads = adsResponse.map(r => { + return { + ...r, + expiresAt: new Date(r.expiresAt).toISOString().slice(0, 16), + }; + }); }); function add() { |