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

data-key for extrafielsds has prefix of element

Browse Source
This commit is contained in:
Laurent Destailleur 2021-10-25 13:29:08 +02:00
parent f5562177e7
commit 15c80327b1
3 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
htdocs/core/tpl/extrafields_list_print_fields.tpl.php
View File

@ -19,13 +19,8 @@ if (!empty($extrafieldsobjectkey) && !empty($extrafields->attributes[$extrafield
foreach ($extrafields->attributes[$extrafieldsobjectkey]['label'] as $key => $val) { foreach ($extrafields->attributes[$extrafieldsobjectkey]['label'] as $key => $val) {
if (!empty($arrayfields[$extrafieldsobjectprefix.$key]['checked'])) { if (!empty($arrayfields[$extrafieldsobjectprefix.$key]['checked'])) {
$align = $extrafields->getAlignFlag($key, $extrafieldsobjectkey); $cssclass = $extrafields->getAlignFlag($key, $extrafieldsobjectkey);
print '<td';
if ($align) {
print ' class="'.$align.'"';
}
print ' data-key="'.$key.'"';
print '>';
$tmpkey = 'options_'.$key; $tmpkey = 'options_'.$key;
if (in_array($extrafields->attributes[$extrafieldsobjectkey]['type'][$key], array('date', 'datetime', 'timestamp')) && !is_numeric($obj->$tmpkey)) { if (in_array($extrafields->attributes[$extrafieldsobjectkey]['type'][$key], array('date', 'datetime', 'timestamp')) && !is_numeric($obj->$tmpkey)) {
@ -47,8 +42,16 @@ if (!empty($extrafieldsobjectkey) && !empty($extrafields->attributes[$extrafield
//var_dump($value); //var_dump($value);
} }
print $extrafields->showOutputField($key, $value, '', $extrafieldsobjectkey); $valuetoshow = $extrafields->showOutputField($key, $value, '', $extrafieldsobjectkey);
$title = dol_string_nohtmltag($valuetoshow);
print '<td'.($cssclass ? ' class="'.$cssclass.'"' : ''); // TODO Add 'css' and 'cssview' and 'csslist' for extrafields and use here 'csslist'
print ' data-key="'.$extrafieldsobjectkey.'.'.$key.'"';
print ($title ? ' title="'.dol_escape_htmltag($title).'"' : '');
print '>';
print $valuetoshow;
print '</td>'; print '</td>';
if (!$i) { if (!$i) {
$totalarray['nbfield']++; $totalarray['nbfield']++;
} }

8
htdocs/societe/list.php
View File

@ -1094,7 +1094,7 @@ if (!empty($arrayfields['country.code_iso']['checked'])) {
if (!empty($arrayfields['typent.code']['checked'])) { if (!empty($arrayfields['typent.code']['checked'])) {
print '<td class="liste_titre maxwidthonsmartphone center">'; print '<td class="liste_titre maxwidthonsmartphone center">';
// We use showempty=0 here because there is already an unknown value into dictionary. // We use showempty=0 here because there is already an unknown value into dictionary.
print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 1, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT), 'minwidth50 maxwidth100', 1); print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 1, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT), 'minwidth50 maxwidth125', 1);
print '</td>'; print '</td>';
} }
// Multiprice level // Multiprice level
@ -1508,11 +1508,13 @@ while ($i < min($num, $limit)) {
} }
// Type ent // Type ent
if (!empty($arrayfields['typent.code']['checked'])) { if (!empty($arrayfields['typent.code']['checked'])) {
print '<td class="center">';
if (!isset($typenArray) || !is_array($typenArray) || count($typenArray) == 0) { if (!isset($typenArray) || !is_array($typenArray) || count($typenArray) == 0) {
$typenArray = $formcompany->typent_array(1); $typenArray = $formcompany->typent_array(1);
} }
print empty($typenArray[$obj->typent_code]) ? '' : $typenArray[$obj->typent_code]; $labeltypeofcompany= empty($typenArray[$obj->typent_code]) ? '' : $typenArray[$obj->typent_code];
print '<td class="center tdoverflowmax125" title="'.dol_escape_htmltag($labeltypeofcompany).'">';
print dol_escape_htmltag($labeltypeofcompany);
print '</td>'; print '</td>';
if (!$i) { if (!$i) {
$totalarray['nbfield']++; $totalarray['nbfield']++;

2
htdocs/theme/md/style.css.php
View File

@ -2714,7 +2714,6 @@ table.login_table_securitycode tr td {
div.login_block { div.login_block {
top: 0; top: 0;
border-right: 1px solid rgba(0,0,0,0.3);
padding-top: 3px; padding-top: 3px;
padding-bottom: 3px; padding-bottom: 3px;
<?php print $left; ?>: 0; <?php print $left; ?>: 0;
@ -6826,6 +6825,7 @@ div.clipboardCPValue.hidewithsize {
@media only screen and (max-width: 570px) @media only screen and (max-width: 570px)
{ {
div.login_block { div.login_block {
border-right: 1px solid rgba(0,0,0,0.3);
top: auto; top: auto;
} }