-
Notifications
You must be signed in to change notification settings - Fork 396
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.
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
django object level permissions support #253
Open
dirkmoors
wants to merge
6
commits into
llazzaro:develop
Choose a base branch
from
dirkmoors:feature/django-guardian-support
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
e8c392a
Added view permission to Meta classes for models
dirkmoors 4e355aa
Merge remote-tracking branch 'upstream/develop' into feature/django-g…
dirkmoors 089226f
Merge remote-tracking branch 'upstream/develop' into feature/django-g…
dirkmoors 07aee62
Fixed conflict in events.py
dirkmoors 5108032
Merge remote-tracking branch 'upstream/develop' into feature/django-g…
dirkmoors f0c04a8
Fixed migrations
dirkmoors File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,3 +6,4 @@ | |
/dist/ | ||
/django_scheduler.egg-info/ | ||
/docs/_build/ | ||
.idea/ | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
# -*- coding: utf-8 -*- | ||
# Generated by Django 1.10.1 on 2016-09-21 07:45 | ||
from __future__ import unicode_literals | ||
|
||
from django.db import migrations | ||
|
||
|
||
class Migration(migrations.Migration): | ||
|
||
dependencies = [ | ||
('schedule', '0003_auto_20160715_0028'), | ||
] | ||
|
||
operations = [ | ||
migrations.AlterModelOptions( | ||
name='calendar', | ||
options={'permissions': (('view_calendar', 'View Calendar'),), 'verbose_name': 'calendar', 'verbose_name_plural': 'calendar'}, | ||
), | ||
migrations.AlterModelOptions( | ||
name='calendarrelation', | ||
options={'permissions': (('view_calendar_relation', 'View Calendar Relation'),), 'verbose_name': 'calendar relation', 'verbose_name_plural': 'calendar relations'}, | ||
), | ||
migrations.AlterModelOptions( | ||
name='event', | ||
options={'permissions': (('view_event', 'View Event'),), 'verbose_name': 'event', 'verbose_name_plural': 'events'}, | ||
), | ||
migrations.AlterModelOptions( | ||
name='eventrelation', | ||
options={'permissions': (('view_event_relation', 'View Event Relation'),), 'verbose_name': 'event relation', 'verbose_name_plural': 'event relations'}, | ||
), | ||
migrations.AlterModelOptions( | ||
name='occurrence', | ||
options={'permissions': (('view_occurrence', 'View Occurrence'),), 'verbose_name': 'occurrence', 'verbose_name_plural': 'occurrences'}, | ||
), | ||
migrations.AlterModelOptions( | ||
name='rule', | ||
options={'permissions': (('view_occurrence', 'View Occurrence'),), 'verbose_name': 'rule', 'verbose_name_plural': 'rules'}, | ||
), | ||
] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you remove this line? It looks unrelated to the PR of adding object level permissions.