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

some updates #182

Merged
merged 15 commits into from
Mar 12, 2016
Merged

some updates #182

merged 15 commits into from
Mar 12, 2016

Conversation

symbiosdotwiki
Copy link
Contributor

No description provided.

@symbiosdotwiki symbiosdotwiki changed the title sone updates some updates Mar 7, 2016
@llazzaro
Copy link
Owner

llazzaro commented Mar 8, 2016

can you write a summary of the changes? I don't see references to any ticket.
I have to review each diff and it's sometimes difficult to track changes.

@symbiosdotwiki
Copy link
Contributor Author

Settings added:
USE_FULLCALENDAR - replaces use of daycalendar with fullcalendar
EVENT_NAME_PLACEHOLDER - sets the default event name when events are created through the drag/select function on fullcalendar
CHECK_OCCURRENCE_PERM_FUNC - allows for by-occurrence edit permissions

Templates fixed:
fullcalendar_script.html - this contains the javascript portion of the fullcalendar app (allows for embedding it outside of the main user hub, such as admin)
fullcalendar_modal.html - allows the user to pick editing/deleting single occurrence or whole event
fullcalendar.html - holds the modal and script
event.html - fixed the bootstrap buttons/switched o glyphicons
occurrence.html - same as above, fixing issue #131

Internals:
utils.py - updated the permission-checking functions to work with calendar/event/occurrence levels
views.py - updated all of the views to take into consideration permissions
events.py - fixed issue #141

all of the fullcalendar additions should also solve issue #119

fixed issue llazzaro#123 and issue llazzaro#137
fbae799 
the issue was that when events are modified, the persisted occurrences
weren’t having their “original_start” and “original_end” being updated,
so the occurrence replacer wasn’t catching them.

To fix this, I calculated the change of time to the start and end of
the event, and add this to the occurrences, so they maintain their
order in the list of occurrences.
@symbiosdotwiki
Copy link
Contributor Author

I also just added a fix to issue #119 and issue #137.

@llazzaro llazzaro merged commit fbae799 into llazzaro:develop Mar 12, 2016
@llazzaro
Copy link
Owner

thanks!!

gustavo-sdo added a commit to gustavo-sdo/django-scheduler that referenced this pull request May 12, 2016
@gustavo-sdo
Add overwritten feature in another commits
1842010 
PK llazzaro#182
@stratoukos stratoukos mentioned this pull request Jul 29, 2016
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@symbiosdotwiki @llazzaro