partkeepr

commit 02e0d74d0c18214e9bc3bae28fa7e657d6928f73
parent 13dfa567c80664e393ea8cf1bcc2834514345c6c
Author: Felicitus <felicitus@felicitus.org>
Date:   Thu, 16 Jun 2011 06:37:40 +0800

Small fixes to improve compatibility with PostgreSQL

Diffstat:
M
src/de/RaumZeitLabor/PartKeepr/Auth/User.php
 | 
2
+-
M
src/de/RaumZeitLabor/PartKeepr/Part/PartManager.php
 | 
3
+--

2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/de/RaumZeitLabor/PartKeepr/Auth/User.php b/src/de/RaumZeitLabor/PartKeepr/Auth/User.php
@@ -2,7 +2,7 @@
 namespace de\RaumZeitLabor\PartKeepr\Auth;
 declare(encoding = 'UTF-8');
 
-/** @Entity @Table(name="`User`") */
+/** @Entity @Table(name="PartKeeprUser") */
 
 class User {
 	/**
diff --git a/src/de/RaumZeitLabor/PartKeepr/Part/PartManager.php b/src/de/RaumZeitLabor/PartKeepr/Part/PartManager.php
@@ -61,7 +61,6 @@ class PartManager extends Singleton {
 				$orderBy = "p.".$sort;
 				break;
 		}
-		$qb->orderBy($orderBy, $dir);
 
 		
 		$category = intval($category);
@@ -104,7 +103,7 @@ class PartManager extends Singleton {
 		
 		
 		$qb->select("p.averagePrice, p.name, p.id, p.stockLevel, p.minStockLevel, p.comment, st.id AS storageLocation_id, st.name as storageLocationName, f.id AS footprint_id, f.footprint AS footprintName, c.id AS category_id, c.name AS categoryName, pu.name AS partUnit, pu.is_default AS partUnitDefault");
-
+		$qb->orderBy($orderBy, $dir);
 		if ($limit > -1) {
 			$qb->setMaxResults($limit);
 			$qb->setFirstResult($start);