github-jwinterm/modoboa
1
0
Fork 0
mirror of https://github.com/jwinterm/modoboa.git synced 2026-10-19 05:58:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Reverting wrong modifications :p

Browse Source
This commit is contained in:
Antoine Nguyen
2013-02-25 10:03:11 +01:00
parent edaedf6ee7
commit e530cc7935
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modoboa/extensions/webmail/imaputils.py
+3 -3
View File
@@ -9,6 +9,7 @@ import time
from functools import wraps
from django.utils.translation import ugettext as _
from modoboa.lib import parameters
from modoboa.lib import imap_utf7
from modoboa.lib.connections import ConnectionsManager
from modoboa.lib.webutils import static_url
from exceptions import ImapError, WebmailError
@@ -385,8 +386,7 @@ class IMAPconnector(object):
mailboxes += sorted(newmboxes, key=itemgetter("name"))
@capability('LIST-EXTENDED', '_listmboxes_simple')
def _listmboxes(self, topmailbox='', mailboxes=None, until_mailbox=None):
if not mailboxes: mailboxes = []
def _listmboxes(self, topmailbox, mailboxes, until_mailbox=None):
pattern = ("%s.%%" % topmailbox.encode("imap4-utf-7")) if len(topmailbox) else "%"
resp = self._cmd("LIST", "", pattern, "RETURN", "(CHILDREN)")
newmboxes = []
@@ -429,7 +429,7 @@ class IMAPconnector(object):
:param unseen_messages: include unseen messages counters or not
:return: a list
"""
if len(topmailbox):
if topmailbox:
md_mailboxes = []
else:
md_mailboxes = [{"name" : "INBOX", "class" : "icon-inbox"},
modoboa/extensions/webmail/static/webmail/js/webmail.js
+1 -1
View File
@@ -73,7 +73,7 @@ Webmail.prototype = {
$(document).on("click", "a[name=editmbox]", $.proxy(this.edit_mbox, this));
$(document).on("click", "a[name=removembox]", $.proxy(this.remove_mbox, this));
$(document).on("click", "tbody>tr", $.proxy(this.viewmail_loader, this));
$(document).on("dblclick", "tbody>tr", $.proxy(this.viewmail_loader, this));
$(document).on("click", "a[name=reply]", $.proxy(this.reply_loader, this));
$(document).on("click", "a[name=replyall]", $.proxy(this.reply_loader, this));