[Fmsystem-commits] [9979]

[Torstein]

Revision: 9979
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9979
Author:   vator
Date:     2012-09-06 12:41:39 +0000 (Thu, 06 Sep 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/controller/inc/class.socontrol.inc.php

Modified: trunk/controller/inc/class.socontrol.inc.php
===================================================================
--- trunk/controller/inc/class.socontrol.inc.php        2012-09-06 12:41:10 UTC 
(rev 9978)
+++ trunk/controller/inc/class.socontrol.inc.php        2012-09-06 12:41:39 UTC 
(rev 9979)
@@ -147,8 +147,9 @@
                            $sql .= "AND c.responsibility_id = $role_id ";
                        }
                        
-                       $sql .= "AND (c.start_date <= $from_date AND c.end_date 
IS NULL ";
-                       $sql .= "OR c.start_date > $from_date AND c.start_date 
< $to_date)";
+                       $sql .= "AND ((c.start_date <= $to_date AND c.end_date 
IS NULL) ";
+                       $sql .= "OR (c.start_date <= $to_date AND c.end_date > 
$from_date ))";
+                       
 
                        $this->db->query($sql);
 
@@ -294,8 +295,8 @@
                          $sql .= "AND c.responsibility_id = $role_id ";
                        }
                            
-                       $sql .= "AND (c.start_date <= $from_date AND c.end_date 
IS NULL ";
-                       $sql .= "OR c.start_date > $from_date AND c.start_date 
< $to_date) ";
+                       $sql .= "AND ((c.start_date <= $to_date AND c.end_date 
IS NULL) ";
+                       $sql .= "OR (c.start_date <= $to_date AND c.end_date > 
$from_date ))";
                        
                        if($filter != null)
                        {