From 529932949c8631f3c3e64817123d67cd73d90d1e Mon Sep 17 00:00:00 2001
From: Frederick Muriuki Muriithi
Date: Mon, 17 Jun 2024 15:46:26 -0500
Subject: Fix error display logic

---
 gn2/wqflask/oauth2/resources.py               | 5 ++++-
 gn2/wqflask/templates/oauth2/create-role.html | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'gn2')

diff --git a/gn2/wqflask/oauth2/resources.py b/gn2/wqflask/oauth2/resources.py
index 0befac85..7ebb82ad 100644
--- a/gn2/wqflask/oauth2/resources.py
+++ b/gn2/wqflask/oauth2/resources.py
@@ -409,11 +409,14 @@ def create_resource_role(resource_id: UUID):
         return render_ui("oauth2/create-role.html", **kwargs)
 
     def __fetch_resource_roles__(resource):
-            lambda error: __render__(resource_role_error=error),
         user = session.session_info()["user"]
         return oauth2_get(
             f"auth/resource/{resource_id}/users/{user['user_id']}"
             "/roles").either(
+                lambda error: {
+                    "resource": resource,
+                    "resource_role_error": process_error(error)
+                },
                 lambda roles: {"resource": resource, "roles": roles})
 
     if request.method == "GET":
diff --git a/gn2/wqflask/templates/oauth2/create-role.html b/gn2/wqflask/templates/oauth2/create-role.html
index 198eacdd..6cf0bb78 100644
--- a/gn2/wqflask/templates/oauth2/create-role.html
+++ b/gn2/wqflask/templates/oauth2/create-role.html
@@ -9,8 +9,8 @@
 
   <p>Create a new role to act on resource "{{resource.resource_name}}"</p>
 
-  {%if group_privileges_error is defined%}
-  {{display_error("Group Privileges", group_privileges_error)}}
+  {%if resource_role_error is defined%}
+  {{display_error("Resource Role", resource_role_error)}}
   {%else%}
   {%if "resource:role:create-role" in (user_privileges|map(attribute="privilege_id")) %}
   <form method="POST" action="{{url_for('oauth2.resource.create_resource_role',
-- 
cgit v1.2.3