Verified Commit fdd051ed authored by les's avatar les
Browse files

Merge branch 'master' into feat/mediaFocalAlt

parents 33f2507c d8bf0f8c
......@@ -11,8 +11,8 @@
v-card-text(v-show='!!message') {{ message }}
v-card-actions
v-spacer
v-btn(color='error' @click='cancel') {{$t('common.cancel')}}
v-btn(color='primary' @click='agree') {{$t('common.ok')}}
v-btn(text color='error' @click='cancel') {{$t('common.cancel')}}
v-btn(text color='primary' @click='agree') {{$t('common.ok')}}
</template>
<script>
......
......@@ -129,7 +129,7 @@
"where_description": "Dov'è il gancio? Se il posto non è presente potrai crearlo.",
"confirmed": "Evento confermato",
"not_found": "Evento non trovato",
"remove_confirmation": "Sei sicuro/a di voler eliminare questo evento?",
"remove_confirmation": "Vuoi eliminare questo evento?",
"remove_recurrent_confirmation": "Sei sicura di voler eliminare questo evento ricorrente?\nGli eventi passati verranno mantenuti ma non ne verranno creati altri.",
"recurrent": "Ricorrente",
"edit_recurrent": "Modifica evento ricorrente:",
......
......@@ -80,7 +80,7 @@
"to-ico": "^1.1.5",
"url": "^0.11.0",
"utf-8-validate": "^5.0.5",
"v-calendar": "2.3.0",
"v-calendar": "2.3.1",
"vue": "^2.6.14",
"vue-clipboard2": "^0.3.1",
"vue-i18n": "^8.24.5",
......@@ -110,7 +110,7 @@
"eslint-plugin-vue": "^7.10.0",
"fibers": "^5.0.0",
"less-loader": "7",
"prettier": "^2.3.2",
"prettier": "^2.3.0",
"pug": "^3.0.2",
"pug-plain-loader": "^1.1.0",
"sass": "^1.32.12",
......
......@@ -58,7 +58,8 @@ export default {
name: 'DateInput',
components: { List },
props: {
value: { type: Object, default: () => ({ from: null, due: null, recurrent: null }) }
value: { type: Object, default: () => ({ from: null, due: null, recurrent: null }) },
event: { type: Object, default: () => null }
},
data () {
return {
......@@ -77,7 +78,7 @@ export default {
todayEvents () {
const start = dayjs(this.value.from).startOf('day').unix()
const end = dayjs(this.value.from).endOf('day').unix()
const events = this.events.filter(e => e.start_datetime >= start && e.start_datetime <= end)
const events = this.events.filter(e => (this.event.id && e.id !== this.event.id) && e.start_datetime >= start && e.start_datetime <= end)
return events
},
attributes () {
......
......@@ -33,7 +33,7 @@
WhereInput(ref='where' v-model='event.place')
//- When
DateInput(v-model='date')
DateInput(v-model='date' :event='event')
//- Description
v-col.px-0(cols='12')
......
......@@ -10,7 +10,7 @@ module.exports = {
if (typeof body.object !== 'string') { return }
const username = body.object.replace(`${config.baseurl}/federation/u/`, '')
if (username !== req.settings.instance_name) {
log.warn(`Following the wrong user: ${username} instead of ${req.settings.instance_name}`)
log.warn(`Following the wrong user: ${username} instead of ${req.settings.instance_name} (could be a wrong config.baseurl)`)
return res.status(404).send('User not found')
}
......
......@@ -43,7 +43,7 @@ const notifier = {
// insert notifications
const notifications = await eventController.getNotifications(event, action)
await event.addNotifications(notifications)
const event_notifications = await event.getNotifications()
const event_notifications = await event.getNotifications({ through: { where: { status: 'new' } } })
const promises = event_notifications.map(async notification => {
try {
......
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment