Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Correctly handle tasks in read-only calendars #523

Merged
merged 7 commits into from
Jul 25, 2019
Merged

Correctly handle tasks in read-only calendars #523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b4e175d
Don't try to edit tasks in read-only calendars
raimund-schluessler Jul 21, 2019
b1393b7
Prevent editing read-only tasks in list view
raimund-schluessler Jul 21, 2019
dd5956e
Don't show delete button in read-only calendars
raimund-schluessler Jul 22, 2019
7acefee
Don't change task info position for read-only task
raimund-schluessler Jul 23, 2019
a2f7f58
Prevent selecting properties for read-only task
raimund-schluessler Jul 23, 2019
48749c4
Don't show empty sections for read-only task
raimund-schluessler Jul 24, 2019
527cb90
Set pointer to default for read-only task
raimund-schluessler Jul 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions css/src/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -990,6 +990,15 @@
margin: 1px -1px;
vertical-align: middle;

&.multiselect--disabled {
background-color: var(--color-main-background) !important;
cursor: default;
.multiselect__single, input:not([type='range']):disabled {
background-color: var(--color-main-background) !important;
cursor: default;
}
}

&.multiselect--active .multiselect__tags {
border: 1px solid var(--color-border-dark);
}
Expand Down Expand Up @@ -1105,6 +1114,18 @@
}

.disabled .body .section {
> div {
.calendar-indicator {
cursor: default;
}
}

&.detail-all-day {
div,
span {
cursor: default;
}
}

&.date:hover .icon.icon-trash {
display: none;
Expand Down Expand Up @@ -1153,6 +1174,10 @@
}
}

&.disabled {
cursor: not-allowed;
}

&.active {
opacity: .7;
}
Expand Down
4 changes: 2 additions & 2 deletions src/components/Task.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,11 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
role="checkbox"
@click="toggleCompleted(task)"
>
<span :class="{'icon-checkmark': task.completed}" class="icon icon-bw task-checkbox reactive no-nav" />
<span :class="{'icon-checkmark': task.completed, 'disabled': task.calendar.readOnly}" class="icon icon-bw task-checkbox reactive no-nav" />
</span>
<span class="icon task-separator" />
<span class="task-star" @click="toggleStarred(task)">
<span :class="[iconStar]" class="icon right large reactive no-nav" />
<span :class="[iconStar, {'disabled': task.calendar.readOnly}]" class="icon right large reactive no-nav" />
</span>
<span v-if="!task.calendar.readOnly"
class="task-addsubtask add-subtask"
Expand Down
2 changes: 1 addition & 1 deletion src/components/TheCollections/Calendar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
/>
</task-drag-container>
<LoadCompletedButton :calendar="calendar" />
<DeleteCompletedModal v-if="calendar.loadedCompleted" :calendar="calendar" />
<DeleteCompletedModal v-if="calendar.loadedCompleted && !calendar.readOnly" :calendar="calendar" />
</div>
</div>
</div>
Expand Down
19 changes: 11 additions & 8 deletions src/components/TheDetails.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
</div>
<div class="body">
<ul class="sections">
<li :class="{'date': valid(task.start), 'editing': edit=='start', 'high': overdue(task.start)}"
<li v-show="!task.calendar.readOnly || task.start" :class="{'date': valid(task.start), 'editing': edit=='start', 'high': overdue(task.start)}"
class="section detail-start"
>
<div v-click-outside="() => finishEditing('start')"
Expand Down Expand Up @@ -95,7 +95,7 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
</a>
</div>
</li>
<li :class="{'date': valid(task.due), 'editing': edit=='due', 'high': overdue(task.due)}"
<li v-show="!task.calendar.readOnly || task.due" :class="{'date': valid(task.due), 'editing': edit=='due', 'high': overdue(task.due)}"
class="section detail-date"
>
<div v-click-outside="() => finishEditing('due')"
Expand Down Expand Up @@ -152,6 +152,7 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
:value="task.calendar"
:multiple="false"
:allow-empty="false"
:disabled="task.calendar.readOnly"
track-by="id"
:placeholder="t('tasks', 'Select a calendar')"
label="displayName"
Expand All @@ -174,6 +175,7 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
:value="classSelect.find( _ => _.type === task.class )"
:multiple="false"
:allow-empty="false"
:disabled="task.calendar.readOnly"
track-by="type"
:placeholder="t('tasks', 'Select a classification')"
label="displayName"
Expand All @@ -186,7 +188,7 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
</div>
</div>
</li>
<li :class="[{'editing': edit=='priority', 'date': task.priority>0}, priorityString]"
<li v-show="!task.calendar.readOnly || task.priority" :class="[{'editing': edit=='priority', 'date': task.priority>0}, priorityString]"
class="section detail-priority"
>
<div v-click-outside="() => finishEditing('priority')"
Expand Down Expand Up @@ -224,7 +226,7 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
</a>
</div>
</li>
<li :class="{'editing': edit=='complete', 'date': task.complete>0}"
<li v-show="!task.calendar.readOnly || task.complete" :class="{'editing': edit=='complete', 'date': task.complete>0}"
class="section detail-complete"
>
<div v-click-outside="() => finishEditing('complete')"
Expand Down Expand Up @@ -260,14 +262,15 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
</a>
</div>
</li>
<li :class="{'active': task.categories.length>0}" class="section detail-categories">
<li v-show="!task.calendar.readOnly || task.categories.length>0" :class="{'active': task.categories.length>0}" class="section detail-categories">
<div>
<span :class="[iconCategories]" class="icon detail-categories" />
<div class="detail-categories-container">
<Multiselect v-if="task.categories"
v-model="task.categories"
:multiple="true"
:searchable="true"
:disabled="task.calendar.readOnly"
:options="task.categories"
:placeholder="t('tasks', 'Select categories')"
:taggable="true"
Expand All @@ -280,7 +283,7 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
</div>
</div>
</li>
<li class="section detail-note">
<li v-show="!task.calendar.readOnly || task.note" class="section detail-note">
<div class="note">
<div v-click-outside="() => finishEditing('note')"
class="note-body selectable"
Expand All @@ -304,7 +307,7 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
</ul>
</div>
<div class="footer">
<a v-show="!task.calendar.readOnly"
<a :style="{visibility: task.calendar.readOnly ? 'hidden' : 'visible'}"
class="close-all reactive"
@click="removeTask"
>
Expand Down Expand Up @@ -520,7 +523,7 @@ export default {
+ (this.task.completed ? ('<br />' + t('tasks', 'Completed %s').replace('%s', moment(this.task.completedDate, 'YYYY-MM-DDTHH:mm:ss').calendar())) : '')
},
isAllDayPossible: function() {
return !this.task.calendar.readOnly && (this.task.due || this.task.start)
return !this.task.calendar.readOnly || (this.task.due || this.task.start)
},
priorityString: function() {
if (+this.task.priority > 5) {
Expand Down
31 changes: 31 additions & 0 deletions src/store/tasks.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -566,6 +566,11 @@ const actions = {
taskData.calendar = context.getters.getDefaultCalendar
}

// Don't try to create tasks in read-only calendars
if (taskData.calendar.readOnly) {
return
}

let task = new Task('BEGIN:VCALENDAR\nVERSION:2.0\nPRODID:-//Nextcloud Tasks v' + appVersion + '\nEND:VCALENDAR', taskData.calendar)

task.created = ICAL.Time.now()
Expand Down Expand Up @@ -632,6 +637,11 @@ const actions = {
* @param {Boolean} [data.dav = true] Trigger a dav deletion
*/
async deleteTask(context, { task, dav = true }) {
// Don't try to delete tasks in read-only calendars
if (task.calendar.readOnly) {
return
}

function deleteTaskFromStore() {
context.commit('deleteTask', task)
let parent = context.getters.getTaskByUid(task.related)
Expand Down Expand Up @@ -680,6 +690,11 @@ const actions = {
* @returns {Promise}
*/
async updateTask(context, task) {
// Don't try to update tasks in read-only calendars
if (task.calendar.readOnly) {
return
}

let vCalendar = ICAL.stringify(task.jCal)

if (!task.conflict) {
Expand Down Expand Up @@ -712,6 +727,10 @@ const actions = {
* @param {Task} task The task to update
*/
async toggleCompleted(context, task) {
// Don't try to edit tasks in read-only calendars
if (task.calendar.readOnly) {
return
}
if (task.completed) {
await context.dispatch('setPercentComplete', { task: task, complete: 0 })
} else {
Expand Down Expand Up @@ -773,6 +792,10 @@ const actions = {
* @param {Task} task The task to update
*/
async toggleStarred(context, task) {
// Don't try to edit tasks in read-only calendars
if (task.calendar.readOnly) {
return
}
context.commit('toggleStarred', task)
context.dispatch('scheduleTaskUpdate', task)
},
Expand Down Expand Up @@ -876,6 +899,10 @@ const actions = {
* @param {Task} task The task to update
*/
async toggleAllDay(context, task) {
// Don't try to toggle tasks from read-only calendars
if (task.calendar.readOnly) {
return task
}
context.commit('toggleAllDay', task)
context.dispatch('scheduleTaskUpdate', task)
},
Expand Down Expand Up @@ -943,6 +970,10 @@ const actions = {
* @returns {Task} The moved task
*/
async moveTask(context, { task, calendar, parent = null }) {
// Don't try to move tasks from read-only calendars
if (task.calendar.readOnly) {
return task
}

// Don't move if source and target calendar are the same.
if (task.dav && task.calendar !== calendar) {
Expand Down