[mms] Fix populating search fields when editing an advanced search qu…

…ery.
horde · Oct 14, 2013 · f498947 · f498947
1 parent 8a28949
commit f498947
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/imp/docs/CHANGES b/imp/docs/CHANGES
@@ -2,6 +2,7 @@
 v6.1.5-git
 ----------
 
+[mms] Fix populating search fields when editing an advanced search query.
 [mms] Trigger auto save draft in dynamic view if attachments have changed.
 [mms] SECURITY: Fix XSS in message and search screens resulting from a
       user-defined flag label (João Machado <geral@jpaulo.eu>).

diff --git a/imp/js/search.js b/imp/js/search.js
@@ -40,7 +40,7 @@ var ImpSearch = {
         }
     },
 
-    updateCriteria: function(criteria)
+    updateCriteria: function(criteria, initial)
     {
         this.resetCriteria();
 
@@ -112,7 +112,9 @@ var ImpSearch = {
         }, this);
 
         if ($('search_criteria').childElements().size()) {
-            $('no_search_criteria', 'search_criteria').invoke('toggle');
+            if (!initial) {
+                $('no_search_criteria', 'search_criteria').invoke('toggle');
+            }
             this.showOr(true);
         }
     },
@@ -693,7 +695,7 @@ var ImpSearch = {
         }
 
         if (this.i_criteria) {
-            this.updateCriteria(this.i_criteria);
+            this.updateCriteria(this.i_criteria, true);
             delete this.i_criteria;
         }
 

diff --git a/imp/package.xml b/imp/package.xml
@@ -33,6 +33,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
  <notes>
+* [mms] Fix populating search fields when editing an advanced search query.
 * [mms] Trigger auto save draft in dynamic view if attachments have changed.
 * [mms] SECURITY: Fix XSS in message and search screens resulting from a user-defined flag label (João Machado &lt;geral@jpaulo.eu&gt;).
 * [mms] Improved UI for dropping attachments on dynamic compose screen.
@@ -3295,6 +3296,7 @@
    <date>2013-09-04</date>
    <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
    <notes>
+* [mms] Fix populating search fields when editing an advanced search query.
 * [mms] Trigger auto save draft in dynamic view if attachments have changed.
 * [mms] SECURITY: Fix XSS in message and search screens resulting from a user-defined flag label (João Machado &lt;geral@jpaulo.eu&gt;).
 * [mms] Improved UI for dropping attachments on dynamic compose screen.