##// END OF EJS Templates
refactor check_Location => check_location
marcink -
r3313:14697de1 beta
parent child Browse files
Show More
@@ -722,7 +722,8 b' class PermsFunction(object):'
722 self.repo_name = None
722 self.repo_name = None
723 self.group_name = None
723 self.group_name = None
724
724
725 def __call__(self, check_Location=''):
725 def __call__(self, check_location=''):
726 #TODO: put user as attribute here
726 user = request.user
727 user = request.user
727 cls_name = self.__class__.__name__
728 cls_name = self.__class__.__name__
728 check_scope = {
729 check_scope = {
@@ -735,19 +736,19 b' class PermsFunction(object):'
735 }.get(cls_name, '?')
736 }.get(cls_name, '?')
736 log.debug('checking cls:%s %s usr:%s %s @ %s', cls_name,
737 log.debug('checking cls:%s %s usr:%s %s @ %s', cls_name,
737 self.required_perms, user, check_scope,
738 self.required_perms, user, check_scope,
738 check_Location or 'unspecified location')
739 check_location or 'unspecified location')
739 if not user:
740 if not user:
740 log.debug('Empty request user')
741 log.debug('Empty request user')
741 return False
742 return False
742 self.user_perms = user.permissions
743 self.user_perms = user.permissions
743 if self.check_permissions():
744 if self.check_permissions():
744 log.debug('Permission to %s granted for user: %s @ %s', self.repo_name, user,
745 log.debug('Permission to %s granted for user: %s @ %s', self.repo_name, user,
745 check_Location or 'unspecified location')
746 check_location or 'unspecified location')
746 return True
747 return True
747
748
748 else:
749 else:
749 log.debug('Permission to %s denied for user: %s @ %s', self.repo_name, user,
750 log.debug('Permission to %s denied for user: %s @ %s', self.repo_name, user,
750 check_Location or 'unspecified location')
751 check_location or 'unspecified location')
751 return False
752 return False
752
753
753 def check_permissions(self):
754 def check_permissions(self):
@@ -770,9 +771,9 b' class HasPermissionAny(PermsFunction):'
770
771
771
772
772 class HasRepoPermissionAll(PermsFunction):
773 class HasRepoPermissionAll(PermsFunction):
773 def __call__(self, repo_name=None, check_Location=''):
774 def __call__(self, repo_name=None, check_location=''):
774 self.repo_name = repo_name
775 self.repo_name = repo_name
775 return super(HasRepoPermissionAll, self).__call__(check_Location)
776 return super(HasRepoPermissionAll, self).__call__(check_location)
776
777
777 def check_permissions(self):
778 def check_permissions(self):
778 if not self.repo_name:
779 if not self.repo_name:
@@ -790,9 +791,9 b' class HasRepoPermissionAll(PermsFunction'
790
791
791
792
792 class HasRepoPermissionAny(PermsFunction):
793 class HasRepoPermissionAny(PermsFunction):
793 def __call__(self, repo_name=None, check_Location=''):
794 def __call__(self, repo_name=None, check_location=''):
794 self.repo_name = repo_name
795 self.repo_name = repo_name
795 return super(HasRepoPermissionAny, self).__call__(check_Location)
796 return super(HasRepoPermissionAny, self).__call__(check_location)
796
797
797 def check_permissions(self):
798 def check_permissions(self):
798 if not self.repo_name:
799 if not self.repo_name:
@@ -810,9 +811,9 b' class HasRepoPermissionAny(PermsFunction'
810
811
811
812
812 class HasReposGroupPermissionAny(PermsFunction):
813 class HasReposGroupPermissionAny(PermsFunction):
813 def __call__(self, group_name=None, check_Location=''):
814 def __call__(self, group_name=None, check_location=''):
814 self.group_name = group_name
815 self.group_name = group_name
815 return super(HasReposGroupPermissionAny, self).__call__(check_Location)
816 return super(HasReposGroupPermissionAny, self).__call__(check_location)
816
817
817 def check_permissions(self):
818 def check_permissions(self):
818 try:
819 try:
@@ -827,9 +828,9 b' class HasReposGroupPermissionAny(PermsFu'
827
828
828
829
829 class HasReposGroupPermissionAll(PermsFunction):
830 class HasReposGroupPermissionAll(PermsFunction):
830 def __call__(self, group_name=None, check_Location=''):
831 def __call__(self, group_name=None, check_location=''):
831 self.group_name = group_name
832 self.group_name = group_name
832 return super(HasReposGroupPermissionAll, self).__call__(check_Location)
833 return super(HasReposGroupPermissionAll, self).__call__(check_location)
833
834
834 def check_permissions(self):
835 def check_permissions(self):
835 try:
836 try:
General Comments 0
You need to be logged in to leave comments. Login now