Explorar o código

HUE-1582 [core] Notification from backend are not shown

Moved the notification to the document.ready section
Enrico Berti %!s(int64=12) %!d(string=hai) anos
pai
achega
3b80ae97fb
Modificáronse 1 ficheiros con 10 adicións e 12 borrados
  1. 10 12
      desktop/core/src/desktop/templates/common_footer.mako

+ 10 - 12
desktop/core/src/desktop/templates/common_footer.mako

@@ -19,18 +19,6 @@ from django.template.defaultfilters import escape, escapejs
 %>
 
 
-%if messages:
-  <script>
-    %for message in messages:
-      %if message.tags == 'error':
-        $(document).trigger('error', '${ escapejs(escape(message)) }');
-      %else:
-        $(document).trigger('info', '${ escapejs(escape(message)) }');
-      %endif
-    %endfor
-  </script>
-%endif
-
 <script type="text/javascript">
   $(document).ready(function () {
     $(document).on("info", function (e, msg) {
@@ -40,6 +28,16 @@ from django.template.defaultfilters import escape, escapejs
       $.jHueNotify.error(msg);
     });
 
+    %if messages:
+      %for message in messages:
+        %if message.tags == 'error':
+          $(document).trigger('error', '${ escapejs(escape(message)) }');
+        %else:
+          $(document).trigger('info', '${ escapejs(escape(message)) }');
+        %endif
+      %endfor
+    %endif
+
     $(".dataTables_wrapper").jHueTableScroller();
     var resetTimeout = -1;
     var pendingRequestsInterval = -1;