From 8f3940aab6002ba623787919a98943b14fb7d0c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Ferry?= Date: Tue, 15 Apr 2014 18:01:18 +0200 Subject: [PATCH] Use fetch_all() method into element resource list --- htdocs/resource/class/resource.class.php | 3 ++- htdocs/resource/element_resource.php | 8 +++++--- htdocs/resource/list.php | 1 - 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/htdocs/resource/class/resource.class.php b/htdocs/resource/class/resource.class.php index 8c83ba46142..4a288947d5d 100644 --- a/htdocs/resource/class/resource.class.php +++ b/htdocs/resource/class/resource.class.php @@ -357,7 +357,8 @@ class Resource extends CommonObject } } $sql.= " GROUP BY t.rowid"; - $sql.= " ORDER BY $sortfield $sortorder " . $this->db->plimit($limit+1,$offset); + $sql.= " ORDER BY $sortfield $sortorder "; + if ($limit) $sql.= $this->db->plimit($limit+1,$offset); dol_syslog(get_class($this)."::fetch_all sql=".$sql, LOG_DEBUG); $resql=$this->db->query($sql); diff --git a/htdocs/resource/element_resource.php b/htdocs/resource/element_resource.php index 95abaf31031..6ba7db53633 100644 --- a/htdocs/resource/element_resource.php +++ b/htdocs/resource/element_resource.php @@ -29,6 +29,7 @@ if (! $res) $res=@include("../../main.inc.php"); // For "custom" directory if (! $res) die("Include of main fails"); require 'class/resource.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; // Load traductions files requiredby by page $langs->load("resource@resource"); @@ -76,7 +77,7 @@ $form=new Form($db); // Load available resource, declared by modules -$ret = $object->fetch_all_available(); +$ret = $object->fetch_all("ASC",'rowid',0); if($ret == -1) { dol_print_error($db,$object->error); exit; @@ -161,8 +162,9 @@ else - print_fiche_titre($langs->trans('ResourcesLinkedToElement'),'','resource_32@resource'); - + print_fiche_titre($langs->trans('ResourcesLinkedToElement'),'','resource.png@resource'); + + foreach ($object->available_resources as $modresources => $resources) { diff --git a/htdocs/resource/list.php b/htdocs/resource/list.php index 847b46383e9..3fde7b52999 100644 --- a/htdocs/resource/list.php +++ b/htdocs/resource/list.php @@ -104,7 +104,6 @@ if(!$ret) { } else { - $var=false; print ''."\n";