Skip to content

Commit

Permalink
Clean up
Browse files Browse the repository at this point in the history
  • Loading branch information
barseghyanartur committed Jul 11, 2022
1 parent b5f7f3c commit 35d1264
Show file tree
Hide file tree
Showing 6 changed files with 387 additions and 301 deletions.
6 changes: 5 additions & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ ignore =
max-line-length = 80

[isort]
line_length = 80
atomic = true
combine_as_imports = true
default_section = THIRDPARTY
Expand All @@ -34,14 +35,17 @@ known_first_party = fobi
known_third_party =
django
factory
multi_line_output = 5
multi_line_output = 3
skip =
docs,
fabfile.py
setup.py,
wsgi.py,
./src/fobi/migrations/*.py,
./src/fobi/south_migrations/*.py
skip_glob = **/migrations/*.py
force_grid_wrap = 0
use_parentheses = true

[metadata]
license-file = LICENSE_GPL2.0.txt
64 changes: 44 additions & 20 deletions src/fobi/permissions/default.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
edit_form_wizard_handler_entry_permission,
wizards_dashboard_permissions,
)
from .generic import BasePermission, AllowAnyPermission
from .generic import AllowAnyPermission, BasePermission
from .helpers import (
login_required,
all_permissions_required_func,
any_permission_required_func,
login_required,
permissions_required_func,
)

Expand Down Expand Up @@ -63,9 +63,13 @@ def has_permission(self, request, view) -> bool:
)(request.user)

def has_object_permission(self, request, view, obj) -> bool:
return login_required(request) and any_permission_required_func(
edit_form_entry_permissions
)(request.user) and obj.user == request.user
return (
login_required(request)
and any_permission_required_func(edit_form_entry_permissions)(
request.user
)
and obj.user == request.user
)


class DeleteFormEntryPermission(BasePermission):
Expand All @@ -77,9 +81,13 @@ def has_permission(self, request, view) -> bool:
)(request.user)

def has_object_permission(self, request, view, obj) -> bool:
return login_required(request) and any_permission_required_func(
delete_form_entry_permissions
)(request.user) and obj.user == request.user
return (
login_required(request)
and any_permission_required_func(delete_form_entry_permissions)(
request.user
)
and obj.user == request.user
)


class AddFormElementEntryPermission(BasePermission):
Expand All @@ -100,9 +108,13 @@ def has_permission(self, request, view) -> bool:
)(request.user)

def has_object_permission(self, request, view, obj) -> bool:
return login_required(request) and permissions_required_func(
edit_form_element_entry_permission
)(request.user) and obj.form_entry.user == request.user
return (
login_required(request)
and permissions_required_func(edit_form_element_entry_permission)(
request.user
)
and obj.form_entry.user == request.user
)


class DeleteFormElementEntryPermission(BasePermission):
Expand All @@ -114,9 +126,13 @@ def has_permission(self, request, view) -> bool:
)(request.user)

def has_object_permission(self, request, view, obj) -> bool:
return login_required(request) and permissions_required_func(
delete_form_element_entry_permission
)(request.user) and obj.form_entry.user == request.user
return (
login_required(request)
and permissions_required_func(delete_form_element_entry_permission)(
request.user
)
and obj.form_entry.user == request.user
)


class AddFormHandlerEntryPermission(BasePermission):
Expand All @@ -140,9 +156,13 @@ def has_permission(self, request, view) -> bool:
)(request.user)

def has_object_permission(self, request, view, obj) -> bool:
return login_required(request) and permissions_required_func(
edit_form_handler_entry_permission
)(request.user) and obj.form_entry.user == request.user
return (
login_required(request)
and permissions_required_func(edit_form_handler_entry_permission)(
request.user
)
and obj.form_entry.user == request.user
)


class DeleteFormHandlerEntryPermission(BasePermission):
Expand All @@ -154,9 +174,13 @@ def has_permission(self, request, view) -> bool:
)(request.user)

def has_object_permission(self, request, view, obj) -> bool:
return login_required(request) and permissions_required_func(
delete_form_handler_entry_permission
)(request.user) and obj.form_entry.user == request.user
return (
login_required(request)
and permissions_required_func(delete_form_handler_entry_permission)(
request.user
)
and obj.form_entry.user == request.user
)


class ViewFormEntryPermission(AllowAnyPermission):
Expand Down
2 changes: 1 addition & 1 deletion src/fobi/tests/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -229,5 +229,5 @@ def take_screenshot(self, name="screenshot"):
f"{name}-{now}.png"
)
self.driver.get_screenshot_as_file(filename)
logger.exception(f"!!!!!!!!!! file: {filename}")
logger.debug(f"Screenshot saved in: {filename}")
return filename
Loading

0 comments on commit 35d1264

Please sign in to comment.