[Fmsystem-commits] [7944]

[Erik Holm-Larsen]

Revision: 7944
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7944
Author:   erikhl
Date:     2011-10-26 07:54:02 +0000 (Wed, 26 Oct 2011)
Log Message:
-----------


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

Modified: trunk/controller/inc/class.soprocedure.inc.php
===================================================================
--- trunk/controller/inc/class.soprocedure.inc.php      2011-10-26 07:49:40 UTC 
(rev 7943)
+++ trunk/controller/inc/class.soprocedure.inc.php      2011-10-26 07:54:02 UTC 
(rev 7944)
@@ -305,7 +305,7 @@
                }
                else
                {
-                       $cols .= "controller_procedure.id, 
controller_procedure.title, controller_procedure.purpose, 
controller_procedure.responsibility, controller_procedure.description, 
controller_procedure.reference, controller_procedure.attachment, 
controller_procedure.start_date, controller_procedure.end_date, 
controller_procedure.procedure_id, controller_procedure.revision_no, 
controller_procedure.revision_date ";
+                       $cols .= "controller_procedure.id, 
controller_procedure.title, controller_procedure.purpose, 
controller_procedure.responsibility, controller_procedure.description, 
controller_procedure.reference, controller_procedure.attachment, 
controller_procedure.start_date, controller_procedure.end_date, 
controller_procedure.procedure_id, controller_procedure.revision_no, 
controller_procedure.revision_date, controller_control_area.title AS 
control_area_name ";
                }
                $dir = $ascending ? 'ASC' : 'DESC';
                $order = $sort_field ? "ORDER BY {$this->marshal($sort_field, 
'field')} $dir ": '';