wbrawner/tasks
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't move non-PUBLIC tasks to calendars shared with me

Browse source 
Signed-off-by: Raimund Schlüßler <raimund.schluessler@mailbox.org>
This commit is contained in:
Raimund Schlüßler 2020-03-07 17:24:00 +01:00
parent 03a6c6290f
commit 55cd4e7158
No known key found for this signature in database
GPG key ID: 036FA7EB1A599178
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/components/TheDetails.vue
View file

@ -184,7 +184,7 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
track-by="id"
:placeholder="$t('tasks', 'Select a calendar')"
label="displayName"
:options="writableCalendars"
:options="targetCalendars"
:close-on-select="true"
class="multiselect-vue"
@input="changeCalendar"
@ -656,6 +656,15 @@ export default {
return 'icon-sprt-bw sprt-current'
}
},
targetCalendars() {
let calendars = this.writableCalendars
// Tasks with an access class other than PUBLIC cannot be moved
// into calendars shared with me
if (this.task.class !== 'PUBLIC') {
calendars = calendars.filter(calendar => !calendar.isSharedWithMe)
}
return calendars
},
...mapGetters({
writableCalendars: 'getSortedWritableCalendars',
task: 'getTaskByRoute',

4
src/store/tasks.js
View file

@ -1183,8 +1183,8 @@ const actions = {
if (task.calendar.readOnly) {
return task
}
// Don't move tasks in shared calendars with access class not PUBLIC
if (task.calendar.isSharedWithMe && task.class !== 'PUBLIC') {
// Don't move tasks with access class not PUBLIC from or to calendars shared with me
if ((task.calendar.isSharedWithMe || calendar.isSharedWithMe) && task.class !== 'PUBLIC') {
return
}
// Don't move if source and target calendar are the same.