Changeset 6054 in subversion

Timestamp:

Apr 10, 2012 3:02:45 AM (14 months ago)

Author:

alec

Message:

• Fix so "Back" from compose/show doesn't reset search request (#1488238)

Location:

trunk/roundcubemail

Files:

• CHANGELOG (modified) (1 diff)
• program/js/app.js (modified) (2 diffs)
• program/steps/mail/compose.inc (modified) (1 diff)

trunk/roundcubemail/CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- Fix so "Back" from compose/show doesn't reset search request (#1488238)
 - Add option to delete messages instead of moving to Trash when in Junk folder (#1486686)
 - Fix invisible cursor when replying to a html message (#1487073)

trunk/roundcubemail/program/js/app.js

@@ -570 +570 @@
 
       case 'list':
-        this.reset_qsearch();
+        if (props && props != '')
+          this.reset_qsearch();
         if (this.task == 'mail') {
           this.list_mailbox(props);
@@ -858 +859 @@
           if (props)
              url += '&_to='+urlencode(props);
+          // also send search request so we can go back to search result after message is sent
+          if (this.env.search_request)
+            url += '&_search='+this.env.search_request;
         }
         // modify url if we're in addressbook

trunk/roundcubemail/program/steps/mail/compose.inc

@@ -119 +119 @@
 
   // redirect to a unique URL with all parameters stored in session
-  $OUTPUT->redirect(array('_action' => 'compose', '_id' => $COMPOSE['id']));
+  $OUTPUT->redirect(array(
+    '_action' => 'compose',
+    '_id'     => $COMPOSE['id'],
+    '_search' => $_REQUEST['_search'],
+  ));
 }