sam/pleroma-fe
sam
/
pleroma-fe
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix announcements lint

This commit is contained in:
Tusooa Zhu 2022-08-01 11:08:09 -04:00 committed by tusooa
parent d74d5a8ce2
commit 1fc0a8b332
No known key found for this signature in database
GPG Key ID: 7B467EDE43A08224
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/components/announcement/announcement.js
View File

@ -42,7 +42,7 @@ const Announcement = {
return this.formatTimeOrDate(time, localeService.internalToBrowserLocale(this.$i18n.locale))
},
startsAt () {
const time = this.announcement['starts_at']
const time = this.announcement.starts_at
if (!time) {
return
}
@ -50,7 +50,7 @@ const Announcement = {
return this.formatTimeOrDate(time, localeService.internalToBrowserLocale(this.$i18n.locale))
},
endsAt () {
const time = this.announcement['ends_at']
const time = this.announcement.ends_at
if (!time) {
return
}
@ -72,13 +72,13 @@ const Announcement = {
},
formatTimeOrDate (time, locale) {
const d = new Date(time)
return this.announcement['all_day'] ? d.toLocaleDateString(locale) : d.toLocaleString(locale)
return this.announcement.all_day ? d.toLocaleDateString(locale) : d.toLocaleString(locale)
},
enterEditMode () {
this.editedAnnouncement.content = this.announcement.pleroma['raw_content']
this.editedAnnouncement.startsAt = this.announcement['starts_at']
this.editedAnnouncement.endsAt = this.announcement['ends_at']
this.editedAnnouncement.allDay = this.announcement['all_day']
this.editedAnnouncement.content = this.announcement.pleroma.raw_content
this.editedAnnouncement.startsAt = this.announcement.starts_at
this.editedAnnouncement.endsAt = this.announcement.ends_at
this.editedAnnouncement.allDay = this.announcement.all_day
this.editing = true
},
submitEdit () {

6
src/services/api/api.service.js
View File

@ -1387,15 +1387,15 @@ const announcementToPayload = ({ content, startsAt, endsAt, allDay }) => {
const payload = { content }
if (typeof startsAt !== 'undefined') {
payload['starts_at'] = startsAt ? new Date(startsAt).toISOString() : null
payload.starts_at = startsAt ? new Date(startsAt).toISOString() : null
}
if (typeof endsAt !== 'undefined') {
payload['ends_at'] = endsAt ? new Date(endsAt).toISOString() : null
payload.ends_at = endsAt ? new Date(endsAt).toISOString() : null
}
if (typeof allDay !== 'undefined') {
payload['all_day'] = allDay
payload.all_day = allDay
}
return payload