[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [15385] controller: fix intervall calculation
From: |
sigurdne |
Subject: |
[Fmsystem-commits] [15385] controller: fix intervall calculation |
Date: |
Wed, 27 Jul 2016 12:41:57 +0000 (UTC) |
Revision: 15385
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15385
Author: sigurdne
Date: 2016-07-27 12:41:56 +0000 (Wed, 27 Jul 2016)
Log Message:
-----------
controller: fix intervall calculation
Modified Paths:
--------------
trunk/controller/inc/class.socontrol.inc.php
Modified: trunk/controller/inc/class.socontrol.inc.php
===================================================================
--- trunk/controller/inc/class.socontrol.inc.php 2016-07-27 12:09:01 UTC
(rev 15384)
+++ trunk/controller/inc/class.socontrol.inc.php 2016-07-27 12:41:56 UTC
(rev 15385)
@@ -1151,7 +1151,8 @@
. " FROM controller_control_component_list"
. " {$this->db->join} controller_control ON
controller_control.id = controller_control_component_list.control_id"
. " {$this->db->left_join}
controller_control_serie ON (controller_control_component_list.id =
controller_control_serie.control_relation_id AND
controller_control_serie.control_relation_type = 'component')"
- . " WHERE location_id = {$location_id} AND
component_id = {$component_id}";
+ . " WHERE location_id = {$location_id} AND
component_id = {$component_id}"
+ . " ORDER BY repeat_type, repeat_interval";
// _debug_array($sql);
$this->db->query($sql, __LINE__, __FILE__);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [15385] controller: fix intervall calculation,
sigurdne <=