Skip to content

Commit efd2635

Browse files
Add a warning if we add a contact that has a user #10789
1 parent 1c52869 commit efd2635

2 files changed

Lines changed: 24 additions & 8 deletions

File tree

htdocs/core/tpl/contacts.tpl.php

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -255,11 +255,13 @@
255255
$entry->contact_id = $userstatic->id;
256256
$entry->contact_html = $userstatic->getNomUrl(-1, '', 0, 0, 0, 0, '', 'valignmiddle');
257257
$entry->contact_name = strtolower($userstatic->getFullName($langs));
258+
$entry->contact_warning = false;
258259
} elseif ($contact['source'] == 'external') {
259260
$contactstatic->fetch($contact['id']);
260261
$entry->contact_id = $contactstatic->id;
261262
$entry->contact_html = $contactstatic->getNomUrl(1, '', 0, '', 0, 0);
262263
$entry->contact_name = strtolower($contactstatic->getFullName($langs));
264+
$entry->contact_warning = ($contactstatic->user_id > 0);
263265
}
264266

265267
if ($contact['source'] == 'internal') {
@@ -325,14 +327,27 @@
325327
print "</tr>";
326328

327329
foreach ($list as $entry) {
328-
print '<tr class="oddeven" data-rowid="' . $entry->id . '">';
329-
330-
print '<td class="tdoverflowmax200" data-thirdparty_id="' . ((int) $entry->thirdparty_id) . '" data-thirdparty_name="' . dol_escape_htmltag($entry->thirdparty_name) . '">'.$entry->thirdparty_html.'</td>';
331-
print '<td class="tdoverflowmax200" data-contact_id="' . ((int) $entry->contact_id) . '">'.$entry->contact_html.'</td>';
332-
print '<td class="nowrap" data-nature="' . dol_escape_htmltag($entry->nature) . '"><span class="opacitymedium">'.dol_escape_htmltag($entry->nature_html).'</span></td>';
333-
print '<td class="tdoverflowmax200" data-type_id="' . ((int) $entry->type_id) . '" data-type="' . dol_escape_htmltag($entry->type) . '">'.dol_escape_htmltag($entry->type).'</td>';
334-
print '<td class="tdoverflowmax200 center" data-status_id="' . ((int) $entry->status) . '">'.$entry->status_html.'</td>';
335-
330+
?>
331+
<tr class="oddeven" data-rowid="<?= $entry->id ?>">
332+
<td class="tdoverflowmax200" data-thirdparty_id="<?= ((int) $entry->thirdparty_id) ?>" data-thirdparty_name="<?= dol_escape_htmltag($entry->thirdparty_name) ?>">
333+
<?= $entry->thirdparty_html ?>
334+
</td>
335+
<td class="tdoverflowmax200" data-contact_id="<?= ((int) $entry->contact_id) ?>">
336+
<?= $entry->contact_html ?>
337+
</td>
338+
<td class="nowrap" data-nature="<?= dol_escape_htmltag($entry->nature) ?>">
339+
<span class="opacitymedium">
340+
<?= dol_escape_htmltag($entry->nature_html) ?>
341+
</span>
342+
<?= ($entry->contact_warning ? img_picto($langs->trans("ThisContactHasAnUser"), 'warning') : '') ?>
343+
</td>
344+
<td class="tdoverflowmax200" data-type_id="<?= ((int) $entry->type_id) ?>" data-type="<?= dol_escape_htmltag($entry->type) ?>">
345+
<?= dol_escape_htmltag($entry->type) ?>
346+
</td>
347+
<td class="tdoverflowmax200 center" data-status_id="<?= ((int) $entry->status) ?>">
348+
<?= $entry->status_html ?>
349+
</td>
350+
<?php
336351
if ($permission) {
337352
$href = $_SERVER["PHP_SELF"];
338353
$href .= '?id='.((int) $object->id);

htdocs/langs/en_US/main.lang

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1299,3 +1299,4 @@ AllEntities=All entities
12991299
TranslationOfKey=Translation of the key AnyTranslationKey
13001300
SignedStatus=Signed status
13011301
NbRecordQualified=Number of qualified records
1302+
ThisContactHasAnUser=Warning, you must assign the associated user and not this contact to allow access to this object.

0 commit comments

Comments
 (0)