github/lina
1
0
Fork 0
mirror of https://github.com/jumpserver/lina.git synced 2026-01-26 13:08:08 +00:00
Code Issues Projects Releases Wiki Activity

feat: Add announcement start and end dates

Browse Source
This commit is contained in:
wangruidong
2024-09-02 16:40:55 +08:00
committed by Bryan
parent 40bb8410d3
commit f4d7a2283c
2 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/components/Widgets/Announcement/index.vue
View File

@@ -35,13 +35,29 @@ export default {
]),
announcement() {
const ann = this.publicSettings.ANNOUNCEMENT
return { id: ann['ID'], subject: ann['SUBJECT'], content: ann['CONTENT'], link: ann['LINK'] }
return {
id: ann['ID'],
subject: ann['SUBJECT'],
content: ann['CONTENT'],
link: ann['LINK'],
date_start: ann['DATE_START'],
date_end: ann['DATE_END']
}
},
enabled() {
return this.publicSettings.ANNOUNCEMENT_ENABLED && (this.announcement.content || this.announcement.subject)
return this.publicSettings.ANNOUNCEMENT_ENABLED && (this.announcement.content || this.announcement.subject) && this.isDateValid
},
title() {
return this.$t('Announcement') + ': ' + this.announcement.subject
},
isDateValid() {
if (this.announcement.date_start === undefined || this.announcement.date_end === undefined) {
return true
}
const now = new Date()
const start = new Date(this.announcement.date_start)
const end = new Date(this.announcement.date_end)
return now >= start && now <= end
}
},
methods: {

2
src/views/settings/Feature/Announcement.vue
View File

@@ -33,7 +33,7 @@ export default {
fieldsMeta: {
ANNOUNCEMENT: {
fields: [
'SUBJECT', 'CONTENT', 'LINK'
'SUBJECT', 'CONTENT', 'DATE_START', 'DATE_END', 'LINK'
],
fieldsMeta: {
CONTENT: {