From 0d73d1732667d49d542a8d5303c0ab9645b2ff22 Mon Sep 17 00:00:00 2001 From: znek Date: Mon, 18 Jul 2005 13:36:54 +0000 Subject: [PATCH] fixed anais and addressbook selection for mail editor git-svn-id: http://svn.opengroupware.org/SOGo/trunk@792 d1b88da0-ebda-0310-925b-ed51d893ca5b --- SOGo/UI/MailerUI/ChangeLog | 10 ++++++++++ SOGo/UI/MailerUI/UIxMailAddressbook.m | 2 +- SOGo/UI/MailerUI/UIxMailToSelection.m | 2 +- SOGo/UI/MailerUI/Version | 2 +- SOGo/UI/Templates/ChangeLog | 3 +++ SOGo/UI/Templates/UIxMailAddressbook.wox | 3 ++- 6 files changed, 18 insertions(+), 4 deletions(-) diff --git a/SOGo/UI/MailerUI/ChangeLog b/SOGo/UI/MailerUI/ChangeLog index a9b01e8d..99375a36 100644 --- a/SOGo/UI/MailerUI/ChangeLog +++ b/SOGo/UI/MailerUI/ChangeLog @@ -1,3 +1,13 @@ +2005-07-18 Marcus Mueller + + * v0.9.147 + + * UIxMailToSelection.m: fixed ordering of parameters for the current + Anais version + + * UIxMailAddressbook.m: fixed parameters being passed on to Anais for + the current Anais version + 2005-07-18 Helge Hess * UIxMailListView.m: improved error handling (display a JavaScript diff --git a/SOGo/UI/MailerUI/UIxMailAddressbook.m b/SOGo/UI/MailerUI/UIxMailAddressbook.m index 32b96c03..0aa6373e 100644 --- a/SOGo/UI/MailerUI/UIxMailAddressbook.m +++ b/SOGo/UI/MailerUI/UIxMailAddressbook.m @@ -57,7 +57,7 @@ NSString *path, *param; - param = @"?m_fonc=addAddress&m_data=datawebmail&m_type=Pour&m_nom=,&m_champ=mail,uid,sn#mon_etiquette"; + param = @"?m_fonc=addAddress&m_data=datawebmail&m_type=Pour&m_nom=,&m_champ=mail,uid,sn,cn,dn&m_nature=BALI&m_agenda0#mon_etiquette"; path = [[self anaisPath] stringByAppendingString:param]; return [self redirectToLocation:path]; } diff --git a/SOGo/UI/MailerUI/UIxMailToSelection.m b/SOGo/UI/MailerUI/UIxMailToSelection.m index 6fc52c46..bada2e37 100644 --- a/SOGo/UI/MailerUI/UIxMailToSelection.m +++ b/SOGo/UI/MailerUI/UIxMailToSelection.m @@ -342,7 +342,7 @@ static NSArray *headers = nil; @" return parts[0];\n" @"}\n" @"\n" - @"function addAddress(type, cn, dn, email, uid, sn) {\n" + @"function addAddress(type, email, uid, sn, cn, dn) {\n" @" var shouldAddRow, s, e;\n" @" \n" @" shouldAddRow = true;\n" diff --git a/SOGo/UI/MailerUI/Version b/SOGo/UI/MailerUI/Version index 7f736d49..ad6ee95f 100644 --- a/SOGo/UI/MailerUI/Version +++ b/SOGo/UI/MailerUI/Version @@ -1,6 +1,6 @@ # version file -SUBMINOR_VERSION:=146 +SUBMINOR_VERSION:=147 # v0.9.140 requires SoObjects/Mailer v0.9.100 # v0.9.134 requires libSOGo v0.9.41 diff --git a/SOGo/UI/Templates/ChangeLog b/SOGo/UI/Templates/ChangeLog index d4816b02..c9ae90e9 100644 --- a/SOGo/UI/Templates/ChangeLog +++ b/SOGo/UI/Templates/ChangeLog @@ -1,5 +1,8 @@ 2005-07-18 Marcus Mueller + * UIxMailAddressbook.wox: changed template text explaining why there's + nothing to be rendered + * UIxMailToSelection.wox: changed JavaScript functions to be more generic diff --git a/SOGo/UI/Templates/UIxMailAddressbook.wox b/SOGo/UI/Templates/UIxMailAddressbook.wox index 48ca0086..11bec55b 100644 --- a/SOGo/UI/Templates/UIxMailAddressbook.wox +++ b/SOGo/UI/Templates/UIxMailAddressbook.wox @@ -10,6 +10,7 @@ - The template of Web Component has not been edited, yet. + You shouldn't see this content at all - the direct actions redirect to + the proper destinations, hence this component is _never_ rendered. \ No newline at end of file -- 2.39.5