LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

See ChangeLog. 

Monotone-Parent: ae85556f790a11b8a40593a88822bee09e847d96
Monotone-Revision: aa6dd506e01700aaff3aa383fbe31691b0d8c795

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-06-04T19:47:36
maint-2.0.2
Francis Lachapelle 2012-06-04 19:47:36 +00:00
parent 939eeba1f7
commit 012e59468d
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2012-06-04 Francis Lachapelle <flachapelle@inverse.ca>
* UI/WebServerResources/UIxFilterEditor.js (savePreferences):
don't validate filters if they are not visible (when matching all
incoming messages).
* SoObjects/Appointments/SOGoAppointmentFolder.m
(-_appendCycleException:firstInstanceCalendarDateRange:fromRow:forRange:withTimeZone:toArray:):
adjust recurrence id according to timezone when dealing with a

26
UI/WebServerResources/UIxFilterEditor.js
View File

@ -786,10 +786,20 @@ function onActionDeleteClick(event) {
function savePreferences(event) {
var valid = true;
var rules = $$("DIV#filterRules DIV.rule");
if (rules.length == 0) {
onRuleAddClick(event);
valid = false;
var container = $('filterRulesContainer');
if (container.visible()) {
var rules = container.select("DIV#filterRules DIV.rule");
if (rules.length == 0) {
onRuleAddClick(event);
valid = false;
}
else {
var inputs = $$("DIV#filterRules input");
inputs.each(function(input) {
if (input.hasClassName("_invalid"))
valid = false;
});
}
}
var actions = $$("DIV#filterActions DIV.action");
@ -798,14 +808,6 @@ function savePreferences(event) {
valid = false;
}
if (valid) {
var inputs = $$("DIV#filterRules input");
inputs.each(function(input) {
if (input.hasClassName("_invalid"))
valid = false;
});
}
if (valid) {
if (window.opener) {
window.opener.updateFilterFromEditor(filterId, Object.toJSON(filter));