amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-08-12 18:33:18 +00:00
Code Issues Projects Releases Wiki Activity

See ChangeLog

Browse Source 
Monotone-Parent: cdff5ba452cb3c31c7ea08e23f764471023265a2
Monotone-Revision: 0b55311518f426ab169d4fd0db8cfe9a54c3e1e6

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2010-06-30T16:53:23
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Ludovic Marcotte
2010-06-30 16:53:23 +00:00
parent 02e66e48a0
commit a7a47ba59b
3 changed files with 30 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+6
View File
@@ -1,3 +1,9 @@
2010-06-30 Ludovic Marcotte <lmarcotte@inverse.ca>
* When displaying cards, we now make sure that
the "service" is non-empty prior creating the
proper field value.
2010-06-30 Francis Lachapelle <flachapelle@inverse.ca>
* UI/WebServerResources/MailerUI.js (onDocumentKeydown): improved
UI/Contacts/UIxContactEditor.m
+11 -5
View File
@@ -1,14 +1,15 @@
/*
Copyright (C) 2004-2005 SKYRIX Software AG
Copyright (C) 2005-2010 Inverse inc.
This file is part of OpenGroupware.org.
This file is part of SOGo
OGo is free software; you can redistribute it and/or modify it under
SOGo is free software; you can redistribute it and/or modify it under
the terms of the GNU Lesser General Public License as published by the
Free Software Foundation; either version 2, or (at your option) any
later version.
OGo is distributed in the hope that it will be useful, but WITHOUT ANY
SOGo is distributed in the hope that it will be useful, but WITHOUT ANY
WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
License for more details.
@@ -324,7 +325,8 @@
- (void) _setupOrgFields
{
NSArray *org, *orgServices;
NSMutableArray *orgServices;
NSArray *org;
NSRange aRange;
unsigned int max;
@@ -336,7 +338,11 @@
if (max > 1)
{
aRange = NSMakeRange (1, max - 1);
orgServices = [org subarrayWithRange: aRange];
orgServices = [NSMutableArray arrayWithArray: [org subarrayWithRange: aRange]];
while ([orgServices containsObject: @""])
[orgServices removeObject: @""];
[self _setSnapshotValue: @"workService"
to: [orgServices componentsJoinedByString: @", "]];
}
UI/Contacts/UIxContactView.m
+13 -7
View File
@@ -1,14 +1,15 @@
/*
Copyright (C) 2004 SKYRIX Software AG
Copyright (C) 2005-2010 Inverse inc.
This file is part of SOGo.
This file is part of OpenGroupware.org.
OGo is free software; you can redistribute it and/or modify it under
SOGo is free software; you can redistribute it and/or modify it under
the terms of the GNU Lesser General Public License as published by the
Free Software Foundation; either version 2, or (at your option) any
later version.
OGo is distributed in the hope that it will be useful, but WITHOUT ANY
SOGo is distributed in the hope that it will be useful, but WITHOUT ANY
WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
License for more details.
@@ -357,15 +358,20 @@
- (NSString *) workService
{
NSArray *org, *orgServices;
NSMutableArray *orgServices;
NSArray *org;
NSRange aRange;
NSString *services;
org = [card org];
if (org && [org count] > 1)
{
aRange = NSMakeRange (1, [org count] - 1);
orgServices = [org subarrayWithRange: aRange];
aRange = NSMakeRange(1, [org count]-1);
orgServices = [NSMutableArray arrayWithArray: [org subarrayWithRange: aRange]];
while ([orgServices containsObject: @""])
[orgServices removeObject: @""];
services = [orgServices componentsJoinedByString: @", "];
}
else