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

Fix strict sql

Browse Source
This commit is contained in:
Laurent Destailleur 2016-08-02 13:10:09 +02:00
parent e335ce6f45
commit fdfe333f69
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/resource/class/dolresource.class.php
View File

@ -393,7 +393,7 @@ class Dolresource extends CommonObject
} }
} }
} }
$sql.= " GROUP BY t.rowid, ty.label"; $sql.= " GROUP BY t.rowid, t.entity, t.ref, t.description, t.fk_code_type_resource, t.tms, ty.label";
$sql.= $this->db->order($sortfield,$sortorder); $sql.= $this->db->order($sortfield,$sortorder);
$this->num_all = 0; $this->num_all = 0;
if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))

29
htdocs/resource/list.php
View File

@ -97,20 +97,18 @@ if($ret == -1) {
} else { } else {
print_barre_liste($pagetitle, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $ret+1, $object->num_all,'title_generic.png'); print_barre_liste($pagetitle, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $ret+1, $object->num_all,'title_generic.png');
} }
if(!$ret) {
print '<div class="warning">'.$langs->trans('NoResourceInDatabase').'</div>'; $var=true;
}
else print '<table class="noborder" width="100%">'."\n";
print '<tr class="liste_titre">';
print_liste_field_titre($langs->trans('Ref'),$_SERVER['PHP_SELF'],'t.ref','',$param,'',$sortfield,$sortorder);
print_liste_field_titre($langs->trans('ResourceType'),$_SERVER['PHP_SELF'],'ty.code','',$param,'',$sortfield,$sortorder);
print_liste_field_titre('',"","","","",'width="60" align="center"',"","");
print "</tr>\n";
if ($ret)
{ {
$var=true;
print '<table class="noborder" width="100%">'."\n";
print '<tr class="liste_titre">';
print_liste_field_titre($langs->trans('Ref'),$_SERVER['PHP_SELF'],'t.ref','',$param,'',$sortfield,$sortorder);
print_liste_field_titre($langs->trans('ResourceType'),$_SERVER['PHP_SELF'],'ty.code','',$param,'',$sortfield,$sortorder);
print_liste_field_titre('',"","","","",'width="60" align="center"',"","");
print "</tr>\n";
foreach ($object->lines as $resource) foreach ($object->lines as $resource)
{ {
$var=!$var; $var=!$var;
@ -142,7 +140,10 @@ else
} }
print '</table>'; print '</table>';
}
else
{
print '<tr><td class="opacitymedium">'.$langs->trans('NoResourceInDatabase').'</td></tr>';
} }
llxFooter(); llxFooter();