Skip to content

Commit

Permalink
community: smoother calendar event deletion (fixes #5401) (#7960)
Browse files Browse the repository at this point in the history
Co-authored-by: dogi <dogi@users.noreply.github.com>
  • Loading branch information
jessewashburn and dogi authored Dec 19, 2024
1 parent 20469f7 commit 1860622
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "planet",
"license": "AGPL-3.0",
"version": "0.16.14",
"version": "0.16.15",
"myplanet": {
"latest": "v0.21.45",
"min": "v0.20.45"
Expand Down
6 changes: 5 additions & 1 deletion src/app/meetups/meetups.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -96,13 +96,17 @@ export class MeetupService {
openDeleteDialog(meetups: any[] | any, callback) {
const isMany = meetups.length > 1;
const displayName = isMany ? '' : (meetups[0] || meetups).title;
const recurringInfo = (meetups[0] || meetups).recurring && (meetups[0] || meetups).recurring !== 'none' && (meetups[0] || meetups).recurringNumber
? `(Recurs ${ (meetups[0] || meetups).recurring} for ${ (meetups[0] || meetups).recurringNumber } ${ (meetups[0] || meetups).recurring === 'daily' ? 'days' : 'weeks' })`
: '';
this.deleteDialog = this.dialog.open(DialogsPromptComponent, {
data: {
okClick: this.deleteMeetups([ meetups ].flat(), displayName, callback),
changeType: 'delete',
type: 'event',
amount: isMany ? 'many' : 'single',
displayName
displayName,
extraMessage: recurringInfo
}
});
}
Expand Down

0 comments on commit 1860622

Please sign in to comment.