diff options
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | program/js/app.js | 6 | ||||
| -rw-r--r-- | program/steps/addressbook/edit.inc | 1 | ||||
| -rw-r--r-- | program/steps/addressbook/save.inc | 24 | ||||
| -rw-r--r-- | program/steps/addressbook/show.inc | 5 |
5 files changed, 28 insertions, 9 deletions
@@ -50,6 +50,7 @@ CHANGELOG Roundcube Webmail - Fix bug where $Forwarded flag was being set even if server didn't support it (#1490000) - Fix various iCloud vCard issues, added fallback for external photos (#1489993) - Fix invalid Content-Type header when send_format_flowed=false (#1489992) +- Fix errors when adding/updating contacts in active search (#1490015) RELEASE 1.0.2 ------------- diff --git a/program/js/app.js b/program/js/app.js index 6a68ebfae..c64318858 100644 --- a/program/js/app.js +++ b/program/js/app.js @@ -4739,6 +4739,7 @@ function rcube_webmail() this.list_contacts = function(src, group, page) { var win, folder, url = {}, + refresh = src === undefined && group === undefined && page === undefined, target = window; if (!src) @@ -4751,7 +4752,7 @@ function rcube_webmail() page = this.env.current_page = 1; this.reset_qsearch(); } - else if (group != this.env.group) + else if (!refresh && group != this.env.group) page = this.env.current_page = 1; if (this.env.search_id) @@ -4890,6 +4891,9 @@ function rcube_webmail() if (this.env.group) url._gid = this.env.group; + if (this.env.search_request) + url._search = this.env.search_request; + url._action = action; url._source = this.env.source; url._cid = cid; diff --git a/program/steps/addressbook/edit.inc b/program/steps/addressbook/edit.inc index 27d26791b..a7def586d 100644 --- a/program/steps/addressbook/edit.inc +++ b/program/steps/addressbook/edit.inc @@ -258,6 +258,7 @@ function get_form_tags($attrib) if ($RCMAIL->action == 'edit') $hiddenfields->add(array('name' => '_source', 'value' => $SOURCE_ID)); $hiddenfields->add(array('name' => '_gid', 'value' => $CONTACTS->group_id)); + $hiddenfields->add(array('name' => '_search', 'value' => rcube_utils::get_input_value('_search', rcube_utils::INPUT_GPC))); if (($result = $CONTACTS->get_result()) && ($record = $result->first())) $hiddenfields->add(array('name' => '_cid', 'value' => $record['ID'])); diff --git a/program/steps/addressbook/save.inc b/program/steps/addressbook/save.inc index 7451f433b..fd0517fe8 100644 --- a/program/steps/addressbook/save.inc +++ b/program/steps/addressbook/save.inc @@ -148,6 +148,15 @@ if (!empty($cid)) { $result = $plugin['result']; if ($result) { + // show confirmation + $OUTPUT->show_message('successfullysaved', 'confirmation', null, false); + + // in search mode, just reload the list (#1490015) + if ($_REQUEST['_search']) { + $OUTPUT->command('parent.command', 'list'); + $OUTPUT->send('iframe'); + } + // LDAP DN change if (is_string($result) && strlen($result)>1) { $newcid = $result; @@ -172,8 +181,6 @@ if (!empty($cid)) { // update the changed col in list $OUTPUT->command('parent.update_contact_row', $cid, $a_js_cols, $newcid, $source, $record); - // show confirmation - $OUTPUT->show_message('successfullysaved', 'confirmation', null, false); $RCMAIL->overwrite_action('show'); } else { @@ -232,8 +239,11 @@ else { $counts = $CONTACTS->count(); } - if ((string)$source === (string)$orig_source) { - // add contact row or jump to the page where it should appear + // show confirmation + $OUTPUT->show_message('successfullysaved', 'confirmation', null, false); + + // add contact row to the list + if (empty($_REQUEST['_search']) && (string)$source === (string)$orig_source) { $CONTACTS->reset(); $result = $CONTACTS->search($CONTACTS->primary_key, $insert_id); @@ -244,13 +254,11 @@ else { $CONTACTS->reset(); $OUTPUT->command('parent.set_rowcount', rcmail_get_rowcount_text($counts)); } + // just refresh the list (#1490015) else { - // re-set iframe - $OUTPUT->command('parent.show_contentframe'); + $OUTPUT->command('parent.command', 'list'); } - // show confirmation - $OUTPUT->show_message('successfullysaved', 'confirmation', null, false); $OUTPUT->send('iframe'); } else { diff --git a/program/steps/addressbook/show.inc b/program/steps/addressbook/show.inc index 8f357cd96..5835ce7e5 100644 --- a/program/steps/addressbook/show.inc +++ b/program/steps/addressbook/show.inc @@ -32,6 +32,11 @@ $SOURCE_ID = $source; if ($cid && ($record = $CONTACTS->get_record($cid, true))) { $OUTPUT->set_env('readonly', $CONTACTS->readonly || $record['readonly']); $OUTPUT->set_env('cid', $record['ID']); + + // remember current search request ID (if in search mode) + if ($search = rcube_utils::get_input_value('_search', rcube_utils::INPUT_GET)) { + $OUTPUT->set_env('search_request', $search); + } } // get address book name (for display) |