Skip to content

Commit

Permalink
New user setting to display full email addresses.
Browse files Browse the repository at this point in the history
fix #53
  • Loading branch information
tonioo committed Mar 7, 2017
1 parent 6e4f97c commit 4fc1f13
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 4 deletions.
16 changes: 16 additions & 0 deletions modoboa_webmail/forms.py
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,16 @@ def clean_to(self):
to = self.cleaned_data["to"]
return email_utils.prepare_addresses(to, "envelope")

def clean_cc(self):
"""Convert to a list."""
cc = self.cleaned_data["cc"]
return email_utils.prepare_addresses(cc, "envelope")

def clean_bcc(self):
"""Convert to a list."""
bcc = self.cleaned_data["bcc"]
return email_utils.prepare_addresses(bcc, "envelope")

def _html_msg(self, sender, headers):
"""Create a multipart message.
Expand Down Expand Up @@ -297,6 +307,12 @@ class UserSettings(param_forms.UserParametersForm):
help_text=_("Enable/Disable HTML links display")
)

display_full_addresses = form_utils.YesNoField(
initial=True,
label=_("Show full email addresses"),
help_text=_("Show full email addresses when displaying a message")
)

messages_per_page = forms.IntegerField(
initial=40,
label=_("Number of displayed emails per page"),
Expand Down
5 changes: 2 additions & 3 deletions modoboa_webmail/lib/imapheader.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,9 @@ def to_unicode(value):


def parse_address(value, **kwargs):
"""Parse an email address.
"""
"""Parse an email address."""
addr = EmailAddress(value)
if "full" in kwargs.keys() and kwargs["full"]:
if kwargs.get("full"):
return to_unicode(addr.fulladdress)
result = addr.name and addr.name or addr.fulladdress
return to_unicode(result)
Expand Down
3 changes: 2 additions & 1 deletion modoboa_webmail/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,8 @@ def getmailcontent(request):
if mbox is None or mailid is None:
raise BadRequest(_("Invalid request"))
email = ImapEmail(
request, False, "%s:%s" % (mbox, mailid), dformat="DISPLAYMODE",
request, request.user.parameters.get_value("display_full_addresses"),
"%s:%s" % (mbox, mailid), dformat="DISPLAYMODE",
links=int(request.GET["links"])
)
return render(request, "common/viewmail.html", {
Expand Down

0 comments on commit 4fc1f13

Please sign in to comment.