Merge d313726 into 7d3df46

amitt001 · Jun 22, 2019 · 934f681 · 934f681
2 parents 7d3df46 + d313726
commit 934f681
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/pygmyui/restclient/error_msg.py b/pygmyui/restclient/error_msg.py
@@ -1,8 +1,8 @@
 import json
 
 
-INVALID_TOKEN = dict(error="Please log in again to continue.")
-INTERNAL_SERVER_ERROR_API = "Something went wrong."
+INVALID_TOKEN = dict(error=["Please log in again to continue."])
+INTERNAL_SERVER_ERROR_API = ["Something went wrong."]
 
 
 def API_ERROR(error_message):
@@ -19,4 +19,4 @@ def API_ERROR(error_message):
         import traceback
         traceback.print_exc()
         error_message = INTERNAL_SERVER_ERROR_API
-    return dict(error=error_message)
+    return dict(error=error_message if isinstance(error_message,list) else [error_message])
diff --git a/pygmyui/templates/400.html b/pygmyui/templates/400.html
@@ -3,7 +3,9 @@
 {% block content %}
 <h1 class="vcenter">400</h1><br>
 {% if error %}
-    <h3 class="vcenter">{{error}}</h3>
+    {%for err in error%}
+        <h3 class="vcenter">{{err}}</h3>
+    {%endfor%}
 {% else %}
     <h3 class="vcenter">Bad Request</h3>
 {% endif %}

diff --git a/pygmyui/templates/404.html b/pygmyui/templates/404.html
@@ -3,7 +3,9 @@
 {% block content %}
 <h1 class="vcenter">404</h1><br>
 {% if error %}
-    <h3 class="vcenter">{{error}}</h3>
+    {%for err in error%}
+        <h3 class="vcenter">{{err}}</h3>
+    {%endfor%}
 {% else %}
     <h3 class="vcenter">Page Not Found</h3>
 {% endif %}

diff --git a/pygmyui/templates/500.html b/pygmyui/templates/500.html
@@ -3,8 +3,10 @@
 {% block content %}
 <h1 class="vcenter">500</h1><br>
 {% if error %}
-    <h3 class="vcenter">{{error}}</h3>
-{% else %}
+    {%for err in error%}
+        <h3 class="vcenter">{{err}}</h3>
+    {%endfor%}
+{% else %}  
     <h3 class="vcenter">Something Went Wrong</h3>
 {% endif %}
 {% endblock content %}