lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #9672 from atm-florian/8.0

Browse Source 
FIX ressource list with extrafields
This commit is contained in:
Laurent Destailleur 2018-10-04 17:40:42 +02:00 committed by GitHub
commit 75b9140446
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/resource/list.php
View File

@ -1,7 +1,7 @@
<?php <?php
/* Copyright (C) 2013-2014 Jean-François Ferry <jfefe@aternatik.fr> /* Copyright (C) 2013-2014 Jean-François Ferry <jfefe@aternatik.fr>
* Copyright (C) 2018 Nicolas ZABOURI <info@inovea-conseil.com> * Copyright (C) 2018 Nicolas ZABOURI <info@inovea-conseil.com>
* *
* This program is free software: you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or * the Free Software Foundation, either version 3 of the License, or
@ -242,14 +242,14 @@ print "</tr>\n";
if ($ret) if ($ret)
{ {
foreach ($object->lines as $obj) foreach ($object->lines as $resource)
{ {
print '<tr class="oddeven">'; print '<tr class="oddeven">';
if (! empty($arrayfields['t.ref']['checked'])) if (! empty($arrayfields['t.ref']['checked']))
{ {
print '<td>'; print '<td>';
print $obj->getNomUrl(5); print $resource->getNomUrl(5);
print '</td>'; print '</td>';
if (! $i) $totalarray['nbfield']++; if (! $i) $totalarray['nbfield']++;
} }
@ -257,7 +257,7 @@ if ($ret)
if (! empty($arrayfields['ty.label']['checked'])) if (! empty($arrayfields['ty.label']['checked']))
{ {
print '<td>'; print '<td>';
print $obj->type_label; print $resource->type_label;
print '</td>'; print '</td>';
if (! $i) $totalarray['nbfield']++; if (! $i) $totalarray['nbfield']++;
} }
@ -266,11 +266,11 @@ if ($ret)
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php'; include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
print '<td align="center">'; print '<td align="center">';
print '<a href="./card.php?action=edit&id='.$obj->id.'">'; print '<a href="./card.php?action=edit&id='.$resource->id.'">';
print img_edit(); print img_edit();
print '</a>'; print '</a>';
print '&nbsp;'; print '&nbsp;';
print '<a href="./card.php?action=delete&id='.$obj->id.'">'; print '<a href="./card.php?action=delete&id='.$resource->id.'">';
print img_delete(); print img_delete();
print '</a>'; print '</a>';
print '</td>'; print '</td>';