Add notifications area

UmSenhorQualquer · Sep 2, 2019 · 0583f86 · 0583f86
1 parent 03a4825
commit 0583f86
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 5 deletions.
diff --git a/pyforms_web/basewidget.py b/pyforms_web/basewidget.py
@@ -302,6 +302,9 @@ def generate_panel(self, formset):
         """
         if formset is None:
             return ''
+        elif 'notifications-area' == formset:
+            return "<div class='notifications-area field'></div>"
+
         elif '=' in formset:
             index = list( formset ).index('=')
             return "<div id='{splitter_id}' class='horizontalSplitter' ><div>{top}</div><div>{bottom}</div></div>".format(

diff --git a/pyforms_web/web/static/pyforms.js b/pyforms_web/web/static/pyforms.js
diff --git a/pyforms_web/web/static/pyformsjs/BaseWidget.js b/pyforms_web/web/static/pyformsjs/BaseWidget.js
@@ -175,7 +175,12 @@ class BaseWidget{
                     for(var i=0; i<msg.messages.length; i++) html += '<li>'+msg.messages[i]+'</li>';
                     html    += '</ul>';
                 };
-                $(html).prependTo(this.jquery()).find('.close').on('click', function(){
+
+                var destination = this.jquery().find('.notifications-area');
+                if( destination.length==0 )
+                    destination = this.jquery()
+
+                $(html).prependTo(destination).find('.close').on('click', function(){
                     $(this).closest('.message').transition({animation:'fade',onComplete:function(){$(this).remove();} });
                 });
             };

diff --git a/utilities/merge-js.py b/utilities/merge-js.py
@@ -49,6 +49,7 @@
     os.path.join("static","pyformsjs","ControlSimpleLabel.js"),
     os.path.join("static","pyformsjs","ControlTimeout.js"),
     os.path.join("static","pyformsjs","ControlEmptyWidget.js"),
+    os.path.join("static","pyformsjs","ControlSearch.js"),
     os.path.join("static","pyformsjs","ControlMenu.js"),
     os.path.join("static","pyformsjs","ControlTree.js"),
     os.path.join("static","pyformsjs","ControlOrganogram.js"),