OWASP-BLT · DonnieBLT · Apr 14, 2025 · Apr 11, 2025 · Apr 11, 2025 · Apr 14, 2025
diff --git a/blt/urls.py b/blt/urls.py
@@ -69,6 +69,7 @@
     ShowBughuntView,
     SlackCallbackView,
     accept_bug,
+    dashboard_view,
     delete_manager,
     delete_prize,
     edit_prize,
@@ -811,7 +812,8 @@
         RegisterOrganizationView.as_view(),
         name="register_organization",
     ),
-    path("organization/dashboard/", Organization_view, name="organization_view"),
+    path("organization/view", Organization_view, name="organization_view"),
+    path("organization/dashboard/", dashboard_view, name="organization_dashboard"),
     path(
         "organization/<int:id>/dashboard/analytics/",
         OrganizationDashboardAnalyticsView.as_view(),

diff --git a/website/templates/includes/header.html b/website/templates/includes/header.html
@@ -608,7 +608,13 @@ <h3 class="font-semibold">Notifications</h3>
                             <li>
                                 <a href="{% url 'organization_view' %}"
                                    class="flex items-center gap-1.5 py-2 px-3 hover:bg-gray-100 rounded-md hover:text-red-600 transition-colors duration-200 font-medium">
-                                    <i class="fa fa-building fa-fw"></i> {% trans "Organization Dashboard" %}
+                                    <i class="fa fa-building fa-fw"></i> {% trans "View Organization" %}
+                                </a>
+                            </li>
+                            <li>
+                                <a href="{% url 'organization_dashboard' %}"
+                                   class="flex items-center gap-1.5 py-2 px-3 hover:bg-gray-100 rounded-md hover:text-red-600 transition-colors duration-200 font-medium">
+                                    <i class="fa fa-gauge fa-fw"></i> {% trans "Organization Dashboard" %}
                                 </a>
                             </li>
                             <li class="border my-2 w-full"></li>

diff --git a/website/templates/includes/navbar.html b/website/templates/includes/navbar.html
@@ -181,7 +181,12 @@
                         </li>
                         <li>
                             <a href="{% url 'organization_view' %}">
-                                <i class="fa fa-building fa-fw"></i> {% trans "Organization Dashboard" %}
+                                <i class="fa fa-building fa-fw"></i> {% trans "View Organization" %}
+                            </a>
+                        </li>
+                        <li>
+                            <a href="{% url 'organization_dashboard' %}">
+                                <i class="fa fa-gauge fa-fw"></i> {% trans "Organization Dashboard" %}
                             </a>
                         </li>
                         <!-- divider -->

diff --git a/website/templates/sitemap.html b/website/templates/sitemap.html
@@ -637,7 +637,7 @@ <h2 class="text-5xl text-red-500 font-bold">Sitemap</h2>
                             </span>
                         </div>
                         <ul class="flex flex-col">
-                            <a href="{% url 'organization_view' %}"
+                            <a href="{% url 'organization_dashboard' %}"
                                class="flex items-center gap-1 text-black cursor-pointer hover:bg-gray-100 group transition duration-200 px-4 py-2 rounded-lg">
                                 <i class="fas fa-tachometer-alt w-5 h-5 mr-1 align-middle text-red-500"></i>
                                 <p class="font-medium text-black/80 group-hover:text-red-500 transition duration-200">Dashboard</p>

diff --git a/website/views/company.py b/website/views/company.py
@@ -74,16 +74,13 @@ def wrapper(self, request, *args, **kwargs):
     return wrapper
 
 
-def Organization_view(request, *args, **kwargs):
-    user = request.user
-
+def _get_user_organization(user):
+    """Helper function to find and return a user's organization."""
     if not user.is_active:
-        messages.info(request, "Email not verified.")
-        return redirect("/")
+        return None, "Email not verified."
 
     if isinstance(user, AnonymousUser):
-        messages.error(request, "Please login to access your organization.")
-        return redirect("/accounts/login/")
+        return None, "Please login to access your organization."
 
     user_organizations = Organization.objects.filter(Q(admin=user) | Q(managers=user))
     if not user_organizations.exists():
@@ -93,15 +90,46 @@ def Organization_view(request, *args, **kwargs):
         # Check if any of these domains belong to a organization
         organizations_with_user_domains = Organization.objects.filter(domain__in=user_domains)
         if not organizations_with_user_domains.exists():
-            messages.error(request, "You do not have a organization, create one.")
-            return redirect("register_organization")
+            return None, "You do not have a organization, create one."
 
     # Get the organization to redirect to
     organization = user_organizations.first() or organizations_with_user_domains.first()
+    return organization, None
+
+
+def Organization_view(request, *args, **kwargs):
+    user = request.user
+
+    organization, error_message = _get_user_organization(user)
+    if error_message:
+        messages.error(request, error_message)
+        if error_message == "Email not verified.":
+            return redirect("/")
+        elif error_message == "Please login to access your organization.":
+            return redirect("/accounts/login/")
+        else:
+            return redirect("register_organization")
 
     return redirect("organization_detail", slug=organization.slug)
 
 
+def dashboard_view(request, *args, **kwargs):
+    user = request.user
+
+    organization, error_message = _get_user_organization(user)
+    if error_message:
+        messages.error(request, error_message)
+        if error_message == "Email not verified.":
+            return redirect("/")
+        elif error_message == "Please login to access your organization.":
+            return redirect("/accounts/login/")
+        else:
+            return redirect("register_organization")
+
+    # Redirect to organization dashboard
+    return redirect("organization_analytics", id=organization.id)
+
+
 class RegisterOrganizationView(View):
     def get(self, request, *args, **kwargs):
         return render(request, "organization/register_organization.html")