[Fmsystem-commits] [12065] bkbooking: stavnger fixed bug in delete allocation code.

[Kjell Arne Espedal]

Revision: 12065
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=12065
Author:   kjell
Date:     2014-08-26 11:25:23 +0000 (Tue, 26 Aug 2014)
Log Message:
-----------
bkbooking:  stavnger fixed bug  in delete allocation code.

Modified Paths:
--------------
    branches/stavangerkommune/booking/inc/class.soallocation.inc.php

Modified: branches/stavangerkommune/booking/inc/class.soallocation.inc.php
===================================================================
--- branches/stavangerkommune/booking/inc/class.soallocation.inc.php    
2014-08-21 12:47:46 UTC (rev 12064)
+++ branches/stavangerkommune/booking/inc/class.soallocation.inc.php    
2014-08-26 11:25:23 UTC (rev 12065)
@@ -239,7 +239,8 @@
             $season_id = $allocation['season_id'];
             $resources = implode(",", $allocation['resources']);
 
-            $sql = "SELECT id FROM bb_allocation ba2 WHERE ba2.from_ = ($from) 
AND ba2.to_ = ($to) AND ba2.organization_id = ($org_id) AND ba2.season_id = 
($season_id) AND EXISTS ( SELECT 1 FROM bb_allocation  a,bb_allocation_resource 
b WHERE a.id = b.allocation_id AND b.resource_id IN ($resources))";
+            $sql = "SELECT id FROM bb_allocation ba2 JOIN 
bb_allocation_resource bar2 ON (ba2.id = bar2.allocation_id) WHERE ba2.from_ = 
($from) AND ba2.to_ = ($to) AND ba2.organization_id = ($org_id) AND 
ba2.season_id = ($season_id) AND  bar2.resource_id IN ($resources)";
+//            $sql = "SELECT id FROM bb_allocation ba2 WHERE ba2.from_ = 
($from) AND ba2.to_ = ($to) AND ba2.organization_id = ($org_id) AND 
ba2.season_id = ($season_id) AND EXISTS ( SELECT 1 FROM bb_allocation  
a,bb_allocation_resource b WHERE a.id = b.allocation_id AND b.resource_id IN 
($resources))";
 
                        $this->db->limit_query($sql, 0,__LINE__, __FILE__,1);
                        if(!$this->db->next_record())