Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FIX: All contacts were loaded even if no thirdparty was selected #31877

Merged
merged 2 commits into from
Nov 16, 2024
Merged

FIX: All contacts were loaded even if no thirdparty was selected #31877

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
22a635a
FIX: All contact were loaded even if no thirdparty selected
Nov 15, 2024
4164bb4
Update card.php
eldy Nov 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 21 additions & 1 deletion htdocs/comm/action/card.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2067,7 +2067,27 @@ function setdatefields()
// related contact
print '<tr><td>'.$langs->trans("ActionOnContact").'</td><td>';
print '<div class="maxwidth200onsmartphone">';
print img_picto('', 'contact', 'class="paddingrightonly"').$form->selectcontacts(!getDolGlobalString('MAIN_ACTIONCOM_CAN_ADD_ANY_CONTACT') ? $object->socid : 0, array_keys($object->socpeopleassigned), 'socpeopleassigned[]', 1, '', '', 1, 'minwidth300 widthcentpercentminusx', false, 0, 0, array(), 'multiple', 'contactid');

$searchSocid = ($object->socid > 0) ? $object->socid : (getDolGlobalString('MAIN_ACTIONCOM_CAN_ADD_ANY_CONTACT') ? 0 : -1);

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You have redondancy with your multiple if statements, you can simplify with

$searchSocid = ($object->socid > 0) ? $object->socid : (getDolGlobalString('MAIN_ACTIONCOM_CAN_ADD_ANY_CONTACT') ? 0 : -1);

print img_picto('', 'contact', 'class="paddingrightonly"');
print $form->selectcontacts(
$searchSocid,
array_keys($object->socpeopleassigned),
'socpeopleassigned[]',
1,
'',
'',
1,
'minwidth300 widthcentpercentminusx',
false,
0,
0,
array(),
'multiple',
'contactid'
);

print '</div>';
print '</td>';
print '</tr>';
Expand Down
Loading