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

Fixed IE-related issues 

Monotone-Parent: 95ed8a2f8950868651d78738a3745fb83e43881a
Monotone-Revision: f03e9d5d24d638e67140a1f29d1e833ae439ef6d

Monotone-Author: crobert@inverse.ca
Monotone-Date: 2009-09-03T18:37:08
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
C Robert 2009-09-03 18:37:08 +00:00
parent 207fff0117
commit 476bb879bb
3 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
UI/Contacts/UIxContactsListView.m
View File

@ -261,13 +261,6 @@
[rc setObject: [NSNumber numberWithInt: imported]
forKey: @"imported"];
if (imported <= 0)
[rc setObject: [self labelForKey: @"An error occured while importing contacts."]
forKey: @"message"];
else
[rc setObject: [NSString stringWithFormat: @"%@ %d",
[self labelForKey: @"Imported contacts:"], imported]
forKey: @"message"];
response = [self responseWithStatus: 200];
[response setHeader: @"text/html"

10
UI/WebServerResources/ContactsUI.js
View File

@ -694,10 +694,12 @@ function uploadCompleted (response) {
var div = $("uploadResults");
$("uploadOK").onclick = hideImportResults;
$("uploadResultsContent").update (data.message);
if (data.imported > 0)
refreshCurrentFolder ();
if (data.imported <= 0)
$("uploadResultsContent").update (labels["An error occured while importing contacts."]);
else {
$("uploadResultsContent").update (labels["Imported contacts:"] + " " + data.imported);
refreshCurrentFolder ();
}
hideContactsImport ();
$("uploadResults").style.display = "block";

10
UI/WebServerResources/SchedulerUI.js
View File

@ -1928,10 +1928,12 @@ function uploadCompleted (response) {
var div = $("uploadResults");
$("uploadOK").onclick = hideImportResults;
$("uploadResultsContent").update (data.message);
if (data.imported > 0)
refreshCurrentFolder ();
if (data.imported <= 0)
$("uploadResultsContent").update (labels["An error occured while importing calendar."]);
else {
$("uploadResultsContent").update (labels["Imported events:"] + " " + data.imported);
refreshCurrentFolder ();
}
hideCalendarImport ();
$("uploadResults").style.display = "block";