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

Jump to bottom

Cancelling reservation #116

Merged
merged 4 commits into from Apr 11, 2017
Merged

Cancelling reservation #116

merged 4 commits into from Apr 11, 2017

Conversation

evehmane
Copy link
Contributor

@evehmane evehmane commented Apr 8, 2017 •
edited

Closes #115

@lraivio lraivio temporarily deployed to huvaja-staging-pr-116 April 8, 2017 10:52 Inactive
@evehmane evehmane force-pushed the feature/115-cancel-reservation branch from 9245ba4 to 4e4103c Compare April 9, 2017 13:56
@evehmane evehmane temporarily deployed to huvaja-staging-pr-116 April 9, 2017 13:56 Inactive
@evehmane evehmane changed the title WIP: Cancelling reservation Cancelling reservation Apr 9, 2017
@evehmane evehmane force-pushed the feature/115-cancel-reservation branch from 4e4103c to 6c4344d Compare April 9, 2017 15:22
@evehmane evehmane temporarily deployed to huvaja-staging-pr-116 April 9, 2017 15:22 Inactive
@oskarihiltunen
Copy link
Contributor

  • The delete button and modal should probably not be shown if the user doesn't have the rights to delete the reservation. I think we should be able to get that info in the frontend, check how Varaamo does it / ask in Slack.

oskarihiltunen
oskarihiltunen suggested changes Apr 10, 2017
View reviewed changes
Copy link
Contributor

@oskarihiltunen oskarihiltunen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Access control (see the comment I made).

@oskarihiltunen
Copy link
Contributor

Rebase + merge.

@evehmane evehmane force-pushed the feature/115-cancel-reservation branch from 6c4344d to 0bfb93c Compare April 11, 2017 07:44
@evehmane evehmane merged commit 931acd8 into develop Apr 11, 2017
@evehmane evehmane deleted the feature/115-cancel-reservation branch April 11, 2017 07:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@oskarihiltunen oskarihiltunen oskarihiltunen approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@evehmane @oskarihiltunen @lraivio