Skip to content

Commit 0f69aa2

Browse files
authored
Merge pull request #53 from lotrekagency/fix/datetime-field-fix
Fix/datetime field fix
2 parents ecc7899 + 22858ba commit 0f69aa2

File tree

3 files changed

+8
-11
lines changed

3 files changed

+8
-11
lines changed

example/pages/listexample/_detail.vue

+6-11
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ en:
3939
published: "Published"
4040
trash: "Trash"
4141
pubblicationDate: "Pubblication Date"
42+
pubblicationDateTime: "Pubblication Date Time"
4243
pubblicationTime: "Pubblication Time"
4344
highlightImage: "Highlight Image"
4445
testTab: "Test tab en"
@@ -65,6 +66,7 @@ it:
6566
published: "Pubblicato"
6667
trash: "Cestinato"
6768
pubblicationDate: "Data di pubblicazione"
69+
pubblicationDateTime: "Data e ora di pubblicazione"
6870
pubblicationTime: "Ora di pubblicazione"
6971
highlightImage: "Immagine in evidenza"
7072
testTab: "Test tab it"
@@ -375,7 +377,7 @@ export default {
375377
synci18n: true,
376378
},
377379
{
378-
value: "pubblication_date",
380+
value: "publication_date",
379381
label: this.$t("pubblicationDate"),
380382
accessor: {
381383
set: ({ val, model }) => {
@@ -394,23 +396,16 @@ export default {
394396
synci18n: true,
395397
},
396398
{
397-
value: "pubblication_date",
398-
label: this.$t("pubblicationTime"),
399-
type: "time",
399+
value: "meta.pubblication_datetime",
400+
label: this.$t("pubblicationDateTime"),
401+
type: "datetime",
400402
synci18n: true,
401403
},
402404
{
403405
value: "meta.simple_time",
404406
type: "time",
405407
synci18n: true,
406408
},
407-
{
408-
value: "pubblication_date",
409-
label: this.$t("pubblicationDate"),
410-
type: "datetime",
411-
synci18n: true,
412-
attrs: { range: false },
413-
},
414409
{
415410
value: "meta.range_datetime",
416411
type: "datetime",

packages/@mapomodule/uikit/components/Form/fields/DateTimeField.vue

+1
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
@click="disableCalendar"
5555
@keydown="disableCalendar"
5656
/>
57+
<v-btn text @click="menu = false">{{ $t('mapo.ok') }}</v-btn>
5758
</v-card-actions>
5859
</v-card>
5960
</v-menu>

packages/@mapomodule/uikit/components/Form/fields/TimeField.vue

+1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
v-bind="$attrs"
3232
/>
3333
</div>
34+
<v-btn text @click="menu = false">{{ $t('mapo.ok') }}</v-btn>
3435
</v-time-picker>
3536
</v-menu>
3637
</div>

0 commit comments

Comments
 (0)