diff --git a/apps/common/permissions.py b/apps/common/permissions.py index 827d388c1..20554e071 100644 --- a/apps/common/permissions.py +++ b/apps/common/permissions.py @@ -86,9 +86,7 @@ class AdminUserRequiredMixin(UserPassesTestMixin): return redirect('orgs:switch-a-org') if not current_org.can_admin_by(request.user): - print("{} cannot admin {}".format(request.user, current_org)) if request.user.is_org_admin: - print("Is org admin") return redirect('orgs:switch-a-org') return HttpResponseForbidden() return super().dispatch(request, *args, **kwargs) diff --git a/apps/jumpserver/views.py b/apps/jumpserver/views.py index 2d90d2047..d70225582 100644 --- a/apps/jumpserver/views.py +++ b/apps/jumpserver/views.py @@ -28,6 +28,8 @@ class IndexView(LoginRequiredMixin, TemplateView): return self.handle_no_permission() if not request.user.is_org_admin: return redirect('assets:user-asset-list') + if not current_org or not current_org.can_admin_by(request.user): + return redirect('orgs:switch-a-org') return super(IndexView, self).dispatch(request, *args, **kwargs) @staticmethod diff --git a/apps/orgs/mixins.py b/apps/orgs/mixins.py index a7ccfa223..29ec794f1 100644 --- a/apps/orgs/mixins.py +++ b/apps/orgs/mixins.py @@ -148,14 +148,12 @@ class OrgModelMixin(models.Model): class OrgViewGenericMixin: def dispatch(self, request, *args, **kwargs): - print("Current org: {}".format(current_org)) if not current_org: return redirect('orgs:switch-a-org') if not current_org.can_admin_by(request.user): print("{} cannot admin {}".format(request.user, current_org)) if request.user.is_org_admin: - print("Is org admin") return redirect('orgs:switch-a-org') return HttpResponseForbidden() else: