From 80b7efed49fd51ce876d6183506c860178b4b838 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Wed, 8 Jun 2011 20:30:21 +0000 Subject: [PATCH] See ChangeLog Monotone-Parent: 64282771e1fb25846e93ccef41b7198b11c569f6 Monotone-Revision: d11c3e99fe05eb716e0732c7b5c44019dcd75934 Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2011-06-08T20:30:21 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 5 +++++ UI/WebServerResources/MailerUI.js | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 1745f6622..b26e7d206 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2011-06-08 Francis Lachapelle + + * UI/WebServerResources/MailerUI.js (initMailer): added the Thread + column if missing from the columnsOrder user's defaults. + 2011-06-06 Wolfgang Sourdeau * OpenChange/*: diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js index e2b8f3700..c7f4765ad 100644 --- a/UI/WebServerResources/MailerUI.js +++ b/UI/WebServerResources/MailerUI.js @@ -1905,7 +1905,9 @@ function initMailer(event) { if (!$(document.body).hasClassName("popup")) { Mailer.columnsOrder = UserDefaults["SOGoMailListViewColumnsOrder"]; Mailer.sortByThread = UserDefaults["SOGoMailSortByThreads"] != null && parseInt(UserDefaults["SOGoMailSortByThreads"]) > 0; - if (!Mailer.sortByThread && Mailer.columnsOrder[0] == "Thread") + if (Mailer.sortByThread && Mailer.columnsOrder[0] != "Thread") + Mailer.columnsOrder = ["Thread"].concat(Mailer.columnsOrder); + else if (!Mailer.sortByThread && Mailer.columnsOrder[0] == "Thread") Mailer.columnsOrder.shift(); // drop the thread column // Restore sorting from user settings