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

Jump to bottom

FIX #10789 Add a warning if we add a contact that has a user #30301

Open
wants to merge 6 commits into
base: develop
Choose a base branch
from
Open

FIX #10789 Add a warning if we add a contact that has a user #30301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
efd2635
Add a warning if we add a contact that has a user #10789
FlorentPoinsaut Jul 11, 2024
23fc9d9
Lint #10789
FlorentPoinsaut Jul 11, 2024
ec268d2
Merge remote-tracking branch 'origin/develop' into fix-external-users…
FlorentPoinsaut Jul 11, 2024
38b2da8
Fix indent #10789
FlorentPoinsaut Jul 12, 2024
c0731e0
Merge branch 'develop' into fix-external-users-cannot-see-projects
FlorentPoinsaut Aug 1, 2024
939a4d1
Merge branch 'develop' into fix-external-users-cannot-see-projects
FlorentPoinsaut Aug 26, 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
42 changes: 28 additions & 14 deletions htdocs/core/tpl/contacts.tpl.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
<?php
/* Copyright (C) 2012 Regis Houssin <[email protected]>
* Copyright (C) 2013-2015 Laurent Destailleur <[email protected]>
* Copyright (C) 2015-2016 Charlie BENKE <[email protected]>
* Copyright (C) 2021 Frédéric France <[email protected]>
/* Copyright (C) 2012 Regis Houssin <[email protected]>
* Copyright (C) 2013-2015 Laurent Destailleur <[email protected]>
* Copyright (C) 2015-2016 Charlie BENKE <[email protected]>
* Copyright (C) 2021 Frédéric France <[email protected]>
* Copyright (C) 2024 Solution Libre SAS <[email protected]>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -255,11 +256,13 @@
$entry->contact_id = $userstatic->id;
$entry->contact_html = $userstatic->getNomUrl(-1, '', 0, 0, 0, 0, '', 'valignmiddle');
$entry->contact_name = strtolower($userstatic->getFullName($langs));
$entry->contact_warning = false;
} elseif ($contact['source'] == 'external') {
$contactstatic->fetch($contact['id']);
$entry->contact_id = $contactstatic->id;
$entry->contact_html = $contactstatic->getNomUrl(1, '', 0, '', 0, 0);
$entry->contact_name = strtolower($contactstatic->getFullName($langs));
$entry->contact_warning = ($contactstatic->user_id > 0);
}

if ($contact['source'] == 'internal') {
Expand Down Expand Up @@ -324,16 +327,27 @@
}
print "</tr>";

foreach ($list as $entry) {
print '<tr class="oddeven" data-rowid="' . $entry->id . '">';

print '<td class="tdoverflowmax200" data-thirdparty_id="' . ((int) $entry->thirdparty_id) . '" data-thirdparty_name="' . dol_escape_htmltag($entry->thirdparty_name) . '">'.$entry->thirdparty_html.'</td>';
print '<td class="tdoverflowmax200" data-contact_id="' . ((int) $entry->contact_id) . '">'.$entry->contact_html.'</td>';
print '<td class="nowrap" data-nature="' . dol_escape_htmltag($entry->nature) . '"><span class="opacitymedium">'.dol_escape_htmltag($entry->nature_html).'</span></td>';
print '<td class="tdoverflowmax200" data-type_id="' . ((int) $entry->type_id) . '" data-type="' . dol_escape_htmltag($entry->type) . '">'.dol_escape_htmltag($entry->type).'</td>';
print '<td class="tdoverflowmax200 center" data-status_id="' . ((int) $entry->status) . '">'.$entry->status_html.'</td>';

if ($permission) {
foreach ($list as $entry) { ?>
<tr class="oddeven" data-rowid="<?php echo $entry->id ?>">
<td class="tdoverflowmax200" data-thirdparty_id="<?php echo ((int) $entry->thirdparty_id) ?>" data-thirdparty_name="<?php echo dol_escape_htmltag($entry->thirdparty_name) ?>">
<?php echo $entry->thirdparty_html ?>
</td>
<td class="tdoverflowmax200" data-contact_id="<?php echo ((int) $entry->contact_id) ?>">
<?php echo $entry->contact_html ?>
</td>
<td class="nowrap" data-nature="<?php echo dol_escape_htmltag($entry->nature) ?>">
<span class="opacitymedium">
<?php echo dol_escape_htmltag($entry->nature_html) ?>
</span>
<?php echo ($entry->contact_warning ? img_picto($langs->trans("ThisContactHasAnUser"), 'warning') : '') ?>
</td>
<td class="tdoverflowmax200" data-type_id="<?php echo ((int) $entry->type_id) ?>" data-type="<?php echo dol_escape_htmltag($entry->type) ?>">
<?php echo dol_escape_htmltag($entry->type) ?>
</td>
<td class="tdoverflowmax200 center" data-status_id="<?php echo ((int) $entry->status) ?>">
<?php echo $entry->status_html ?>
</td>
<?php if ($permission) {
$href = $_SERVER["PHP_SELF"];
$href .= '?id='.((int) $object->id);
$href .= '&action=deletecontact&token='.newToken();
Expand Down
1 change: 1 addition & 0 deletions htdocs/langs/en_US/main.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1306,3 +1306,4 @@ TranslationOfKey=Translation of the key AnyTranslationKey
SignedStatus=Signed status
NbRecordQualified=Number of qualified records
auto=auto
ThisContactHasAnUser=Warning, you must assign the associated user and not this contact to allow access to this object.