Skip to content

Commit

Permalink
* Cleanup unused functions.
Browse files Browse the repository at this point in the history
  • Loading branch information
bgroff committed Oct 31, 2018
1 parent ff70e40 commit aca635d
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 41 deletions.
2 changes: 1 addition & 1 deletion django_kala/auth/views/users.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ def get_context_data(self, **kwargs):
if organization:
try:
organization = Organization.objects.get(name=organization)
organization_users = organization.get_people(self.request.user)
organization_users = self.request.user.get_users()
if organization_users:
users = users.filter(pk__in=organization_users.values_list('pk'))
else:
Expand Down
32 changes: 0 additions & 32 deletions django_kala/documents/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -85,38 +85,6 @@ def get_latest(self):
def list_versions(self):
return self.documentversion_set.all()

def get_users(self, user):
if user.is_superuser:
return User.objects.all()
# If you have permissions for the org, or permissions for the
# project, then you can see everyone in the org.
if Permissions.has_perms([
'change_organization',
'add_organization',
'delete_organization'
], user, self.project.organization.uuid) or Permissions.has_perms([
'add_project',
'change_project',
'delete_project'
], user, self.project.uuid):
return self.project.organization.user_set.all()
if Permissions.has_perms([
'add_document',
'change_document',
'delete_document'
], user, self.uuid):
project_users = DocumentVersion.objects.filter(
document__project=self.project
).prefetch_related(
'document_set'
).select_related(
'user_id'
).values_list(
'user_id', flat=True
)
return User.objects.filter(id__in=project_users)
return None

def can(self, user, _permissions):
if user.is_superuser:
return True
Expand Down
7 changes: 1 addition & 6 deletions django_kala/projects/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,6 @@ def get_documents(self, user):
id__in=user.get_documents().values_list('id', flat=True)
)

def get_users(self, user):
if user.is_superuser:
return User.objects.all()
return user.get_users()

def can(self, user, _permissions):
if user.is_superuser:
return True
Expand Down Expand Up @@ -150,7 +145,7 @@ class ProjectPermission(models.Model):
user = models.ForeignKey(User, on_delete=models.CASCADE)
permission = models.ForeignKey(Permission, on_delete=models.CASCADE)

def __str__(self):
def __str__(self): # pragma: no cover
return '{0} | {1} | {2}'.format(self.project, self.user, self.permission.codename)


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ def test_project_manage_access():
)
assert response.redirect_chain[0][0] == reverse('projects:manage_access', args=[project.pk])
assert response.redirect_chain[0][1] == HTTP_302_FOUND
print(ProjectPermission.objects.all())
assert project.can_create(other_user) == True

# Remove Create
Expand Down
2 changes: 1 addition & 1 deletion django_kala/projects/views/projects/tests/test_projects.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from django.urls import reverse
from rest_framework.status import HTTP_200_OK, HTTP_302_FOUND

from organizations.views.tests import setup, user_permissions_test_invite, login
from organizations.views.tests import setup, login

User = get_user_model()

Expand Down

0 comments on commit aca635d

Please sign in to comment.