# Refactoring team views

* refactors team views
* split views.py into users.py and teams.py in users app
* refactors method headers for _user_has_permission()
* adds method and class comments and documentation to base view classes

ema/views/action.py

@@ -16,14 +16,14 @@ class NewEmaActionView(AbstractNewCompensationActionView):
     _MODEL_CLS = Ema
     _REDIRECT_URL = _EMA_ACCOUNT_DETAIL_URL_NAME
 
-    def _user_has_permission(self, user):
+    def _user_has_permission(self, user, **kwargs):
         return user.is_ets_user()
 
 class EditEmaActionView(AbstractEditCompensationActionView):
     _MODEL_CLS = Ema
     _REDIRECT_URL = _EMA_ACCOUNT_DETAIL_URL_NAME
 
-    def _user_has_permission(self, user):
+    def _user_has_permission(self, user, **kwargs):
         return user.is_ets_user()
 
 
@@ -31,5 +31,5 @@ class RemoveEmaActionView(AbstractRemoveCompensationActionView):
     _MODEL_CLS = Ema
     _REDIRECT_URL = _EMA_ACCOUNT_DETAIL_URL_NAME
 
-    def _user_has_permission(self, user):
+    def _user_has_permission(self, user, **kwargs):
         return user.is_ets_user()

ema/views/deadline.py

@@ -14,7 +14,7 @@ class NewEmaDeadlineView(AbstractNewDeadlineView):
     _MODEL_CLS = Ema
     _REDIRECT_URL = _EMA_DETAIL_URL_NAME
 
-    def _user_has_permission(self, user):
+    def _user_has_permission(self, user, **kwargs):
         return user.is_ets_user()
 
 
@@ -22,7 +22,7 @@ class EditEmaDeadlineView(AbstractEditDeadlineView):
     _MODEL_CLS = Ema
     _REDIRECT_URL = _EMA_DETAIL_URL_NAME
 
-    def _user_has_permission(self, user):
+    def _user_has_permission(self, user, **kwargs):
         return user.is_ets_user()
 
 
@@ -30,5 +30,5 @@ class RemoveEmaDeadlineView(AbstractRemoveDeadlineView):
     _MODEL_CLS = Ema
     _REDIRECT_URL = _EMA_DETAIL_URL_NAME
 
-    def _user_has_permission(self, user):
+    def _user_has_permission(self, user, **kwargs):
         return user.is_ets_user()

ema/views/document.py

@@ -16,14 +16,14 @@ class NewEmaDocumentView(AbstractNewDocumentView):
     _FORM_CLS = NewEmaDocumentModalForm
     _REDIRECT_URL = "ema:detail"
 
-    def _user_has_permission(self, user):
+    def _user_has_permission(self, user, **kwargs):
         return user.is_ets_user()
 
 class GetEmaDocumentView(AbstractGetDocumentView):
     _MODEL_CLS = Ema
     _DOCUMENT_CLS = EmaDocument
 
-    def _user_has_permission(self, user):
+    def _user_has_permission(self, user, **kwargs):
         return user.is_ets_user()
 
 class RemoveEmaDocumentView(AbstractRemoveDocumentView):
@@ -32,7 +32,7 @@ class RemoveEmaDocumentView(AbstractRemoveDocumentView):
     _FORM_CLS = RemoveEmaDocumentModalForm
     _REDIRECT_URL = "ema:detail"
 
-    def _user_has_permission(self, user):
+    def _user_has_permission(self, user, **kwargs):
         return user.is_ets_user()
 
 class EditEmaDocumentView(AbstractEditDocumentView):
@@ -41,5 +41,5 @@ class EditEmaDocumentView(AbstractEditDocumentView):
     _DOCUMENT_CLS = EmaDocument
     _REDIRECT_URL = "ema:detail"
 
-    def _user_has_permission(self, user):
+    def _user_has_permission(self, user, **kwargs):
         return user.is_ets_user()

ema/views/ema.py

@@ -38,7 +38,7 @@ class NewEmaFormView(BaseNewSpatialLocatedObjectFormView):
     _TAB_TITLE = _("New EMA")
     _REDIRECT_URL = "ema:detail"
 
-    def _user_has_permission(self, user):
+    def _user_has_permission(self, user, **kwargs):
         # User has to be an ets user
         return user.is_ets_user()
 
@@ -50,7 +50,7 @@ class EditEmaFormView(BaseEditSpatialLocatedObjectFormView):
     _REDIRECT_URL = "ema:detail"
     _TAB_TITLE = _("Edit {}")
 
-    def _user_has_permission(self, user):
+    def _user_has_permission(self, user, **kwargs):
         # User has to be an ets user
         return user.is_ets_user()
 
@@ -59,7 +59,7 @@ class EmaIdentifierGeneratorView(LoginRequiredMixin, BaseIdentifierGeneratorView
     _MODEL_CLS = Ema
     _REDIRECT_URL = "ema:index"
 
-    def _user_has_permission(self, user):
+    def _user_has_permission(self, user, **kwargs):
         return user.is_ets_user()
 
 
@@ -112,5 +112,5 @@ class RemoveEmaView(LoginRequiredMixin, BaseRemoveModalFormView):
     _MODEL_CLS = Ema
     _REDIRECT_URL = "ema:index"
 
-    def _user_has_permission(self, user):
+    def _user_has_permission(self, user, **kwargs):
         return user.is_ets_user()

ema/views/log.py

@@ -14,5 +14,5 @@ from konova.views.log import AbstractLogView
 class EmaLogView(LoginRequiredMixin, AbstractLogView):
     _MODEL_CLS = Ema
 
-    def _user_has_permission(self, user):
+    def _user_has_permission(self, user, **kwargs):
         return user.is_ets_user()

ema/views/resubmission.py

@@ -16,5 +16,5 @@ class EmaResubmissionView(AbstractResubmissionView):
     _REDIRECT_URL = "ema:detail"
     action_url = "ema:resubmission-create"
 
-    def _user_has_permission(self, user):
+    def _user_has_permission(self, user, **kwargs):
         return user.is_ets_user()

ema/views/share.py

@@ -17,5 +17,5 @@ class EmaShareFormView(AbstractShareFormView):
     _MODEL_CLS = Ema
     _REDIRECT_URL = "ema:detail"
 
-    def _user_has_permission(self, user):
+    def _user_has_permission(self, user, **kwargs):
         return user.is_ets_user()

ema/views/state.py

@@ -14,7 +14,7 @@ class NewEmaStateView(AbstractNewCompensationStateView):
     _MODEL_CLS = Ema
     _REDIRECT_URL = "ema:detail"
 
-    def _user_has_permission(self, user):
+    def _user_has_permission(self, user, **kwargs):
         return user.is_ets_user()
 
 
@@ -22,7 +22,7 @@ class EditEmaStateView(AbstractEditCompensationStateView):
     _MODEL_CLS = Ema
     _REDIRECT_URL = "ema:detail"
 
-    def _user_has_permission(self, user):
+    def _user_has_permission(self, user, **kwargs):
         return user.is_ets_user()
 
 
@@ -30,5 +30,5 @@ class RemoveEmaStateView(AbstractRemoveCompensationStateView):
     _MODEL_CLS = Ema
     _REDIRECT_URL = "ema:detail"
 
-    def _user_has_permission(self, user):
+    def _user_has_permission(self, user, **kwargs):
         return user.is_ets_user()