Changeset 5264 in subversion

Timestamp:

Sep 21, 2011 4:43:47 PM (20 months ago)

Author:

thomasb

Message:

Skip confirmation dialog when deleting a contact from a source that supports undelete operations

Location:

trunk/roundcubemail/program

Files:

• include/rcmail.php (modified) (1 diff)
• js/app.js (modified) (1 diff)

trunk/roundcubemail/program/include/rcmail.php

@@ -484 +484 @@
         'groups'   => $this->address_books['0']->groups,
         'readonly' => $this->address_books['0']->readonly,
-        'autocomplete' => in_array('sql', $autocomplete)
+        'autocomplete' => in_array('sql', $autocomplete),
+        'undelete' => $this->address_books['0']->undelete && $this->config->get('undo_timeout'),
       );
     }

trunk/roundcubemail/program/js/app.js

@@ -3995 +3995 @@
     // exit if no mailbox specified or if selection is empty
     var selection = this.contact_list.get_selection();
-    if (!(selection.length || this.env.cid) || !confirm(this.get_label('deletecontactconfirm')))
+    var undelete = this.env.address_sources[this.env.source].undelete;
+    if (!(selection.length || this.env.cid) || (!undelete && !confirm(this.get_label('deletecontactconfirm'))))
       return;