extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 06:30:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Addressbook: Fix organisation CRM view did not show nextmatch if contact had no org name

Browse Source 
Translations from Birgit
This commit is contained in:
nathangray 2019-10-25 10:18:46 -06:00
parent 6f58e88ecc
commit 20466003a0
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
addressbook/inc/class.addressbook_ui.inc.php
View File

@ -2913,7 +2913,7 @@ class addressbook_ui extends addressbook_bo
if($contact_id) if($contact_id)
{ {
// Show for whole organisation, not just selected contact // Show for whole organisation, not just selected contact
if($crm_list == 'infolog-organisation' && $content['org_name']) if($crm_list == 'infolog-organisation')
{ {
$crm_list = str_replace('-organisation','',$crm_list); $crm_list = str_replace('-organisation','',$crm_list);
$_query = Api\Cache::getSession('addressbook', 'index'); $_query = Api\Cache::getSession('addressbook', 'index');
@ -2937,6 +2937,13 @@ class addressbook_ui extends addressbook_bo
function get_all_org_contacts($contact_id, $query = array()) function get_all_org_contacts($contact_id, $query = array())
{ {
$contact = $this->read($contact_id); $contact = $this->read($contact_id);
// No org name, early return with just the contact
if(!$contact['org_name'])
{
return array($contact_id);
}
$query['num_rows'] = -1; $query['num_rows'] = -1;
$query['start'] = 0; $query['start'] = 0;
if(!array_key_exists('filter', $query)) if(!array_key_exists('filter', $query))

7
addressbook/lang/egw_de.lang
View File

@ -317,6 +317,7 @@ imports contacts into your addressbook from a vcard file. addressbook de Importi
in %1 days (%2) is %3's birthday. addressbook de In %1 Tagen (%2) ist der Geburtstag von %3. in %1 days (%2) is %3's birthday. addressbook de In %1 Tagen (%2) ist der Geburtstag von %3.
income addressbook de Einkommen income addressbook de Einkommen
infolog addressbook de InfoLog infolog addressbook de InfoLog
infolog-organisation addressbook de Öffnet Infolog CRM-Ansicht der Organisation
insert addressbook de einfügen insert addressbook de einfügen
insufficent rights to delete this list! addressbook de Keine Rechte vorhanden um diese Liste zu löschen! insufficent rights to delete this list! addressbook de Keine Rechte vorhanden um diese Liste zu löschen!
insufficent rights to edit this list! addressbook de Keine Rechte vorhanden um diese Liste zu ändern! insufficent rights to edit this list! addressbook de Keine Rechte vorhanden um diese Liste zu ändern!
@ -381,8 +382,8 @@ number of records to read (%1) addressbook de Anzahl der einzulesenden Datensät
open %1 crm view addressbook de Öffnet %1 in der CRM-Ansicht open %1 crm view addressbook de Öffnet %1 in der CRM-Ansicht
open email addresses in external mail program addressbook de Öffne E-Mail Adressen in externem Mail-Programm open email addresses in external mail program addressbook de Öffne E-Mail Adressen in externem Mail-Programm
open for editing? addressbook de Zum Bearbeiten öffnen? open for editing? addressbook de Zum Bearbeiten öffnen?
open infolog crm view preferences de InfoLog CRM-Ansicht öffnen open infolog crm view preferences de Öffnet Infolog CRM-Ansicht des Kontaktes
open tracking system crm view preferences de Ticket System CRM-Ansicht öffnen open tracking system crm view preferences de Öffnet Verfolgungssystem in der CRM-Ansicht
options for type admin de Optionen für Typ options for type admin de Optionen für Typ
organisation addressbook de Organisation organisation addressbook de Organisation
organisations addressbook de Organisationen organisations addressbook de Organisationen
@ -529,7 +530,7 @@ warning!! ldap is valid only if you are not using contacts for accounts storage!
warning: all contacts found will be deleted! addressbook de WARNUNG: Alle gefundenen Kontakte werden gelöscht ! warning: all contacts found will be deleted! addressbook de WARNUNG: Alle gefundenen Kontakte werden gelöscht !
weekday addressbook de Wochentag weekday addressbook de Wochentag
what should links to the addressbook display in other applications. empty values will be left out. you need to log in anew, if you change this setting! addressbook de Was sollen Verknüpfungen zum Adressbuch in anderen Anwendungen anzeigen. Leere Werte werden ausgelassen. Sie müssen sich neu anmelden, wenn Sie hier eine Änderung vornehmen! what should links to the addressbook display in other applications. empty values will be left out. you need to log in anew, if you change this setting! addressbook de Was sollen Verknüpfungen zum Adressbuch in anderen Anwendungen anzeigen. Leere Werte werden ausgelassen. Sie müssen sich neu anmelden, wenn Sie hier eine Änderung vornehmen!
when viewing a contact, show linked entries from the selected application addressbook de Bei der Ansicht eine Kontaktes werden nur Links zu folgenden Anwendungen geziegt when viewing a contact, show linked entries from the selected application addressbook de Bei der Ansicht eine Kontaktes werden nur Links zu folgenden Anwendungen gezeigt.
where to add the email address addressbook de wo soll die E-Mail-Adresse hinzugefügt werden where to add the email address addressbook de wo soll die E-Mail-Adresse hinzugefügt werden
which address format should the addressbook use for countries it does not know the address format. if the address format of a country is known, it uses it independent of this setting. addressbook de Welches Format soll das Adressbuch für Adressen verwenden, deren landesübliches Adressformat unbekannt ist. Wenn das Adressformat eines Landes dem Adressbuch bekannt ist, wird das unabhängig von dieser Einstellung benutzt. which address format should the addressbook use for countries it does not know the address format. if the address format of a country is known, it uses it independent of this setting. addressbook de Welches Format soll das Adressbuch für Adressen verwenden, deren landesübliches Adressformat unbekannt ist. Wenn das Adressformat eines Landes dem Adressbuch bekannt ist, wird das unabhängig von dieser Einstellung benutzt.
which addressbook should be selected when adding a contact and you have no add rights to the current addressbook. addressbook de Welches Adressbuch soll beim Hinzufügen von Kontakten ausgewählt sein, wenn Sie keine Hinzufügen Rechte zum aktuellen Adressbuch haben. which addressbook should be selected when adding a contact and you have no add rights to the current addressbook. addressbook de Welches Adressbuch soll beim Hinzufügen von Kontakten ausgewählt sein, wenn Sie keine Hinzufügen Rechte zum aktuellen Adressbuch haben.

4
addressbook/lang/egw_en.lang
View File

@ -317,7 +317,7 @@ imports contacts into your addressbook from a vcard file. addressbook en Imports
in %1 days (%2) is %3's birthday. addressbook en In %1 days (%2) is %3's birthday. in %1 days (%2) is %3's birthday. addressbook en In %1 days (%2) is %3's birthday.
income addressbook en Income income addressbook en Income
infolog addressbook en InfoLog infolog addressbook en InfoLog
infolog-organisation addressbook en Infolog CRM for organisation infolog-organisation addressbook en Open Infolog CRM view of the organisation
insert addressbook en Insert insert addressbook en Insert
insufficent rights to delete this list! addressbook en Insufficient rights to delete this list! insufficent rights to delete this list! addressbook en Insufficient rights to delete this list!
insufficent rights to edit this list! addressbook en Insufficent rights to edit this list! insufficent rights to edit this list! addressbook en Insufficent rights to edit this list!
@ -382,7 +382,7 @@ number of records to read (%1) addressbook en Number of records to read (%1)
open %1 crm view addressbook en Open %1 CRM view open %1 crm view addressbook en Open %1 CRM view
open email addresses in external mail program addressbook en Open EMail addresses in external mail program open email addresses in external mail program addressbook en Open EMail addresses in external mail program
open for editing? addressbook en Open for editing? open for editing? addressbook en Open for editing?
open infolog crm view preferences en Open InfoLog CRM view open infolog crm view preferences en Open InfoLog CRM view of the contact
open tracking system crm view preferences en Open Tracking System CRM view open tracking system crm view preferences en Open Tracking System CRM view
options for type admin en Options for type options for type admin en Options for type
organisation addressbook en Organisation organisation addressbook en Organisation