[Fmsystem-commits] [9307]

[Erik Holm-Larsen]

Revision: 9307
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9307
Author:   erikhl
Date:     2012-05-08 08:12:58 +0000 (Tue, 08 May 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/controller/inc/class.soprocedure.inc.php
    trunk/controller/inc/class.uiprocedure.inc.php
    trunk/controller/templates/base/procedure/procedure_item.xsl

Modified: trunk/controller/inc/class.soprocedure.inc.php
===================================================================
--- trunk/controller/inc/class.soprocedure.inc.php      2012-05-08 06:45:50 UTC 
(rev 9306)
+++ trunk/controller/inc/class.soprocedure.inc.php      2012-05-08 08:12:58 UTC 
(rev 9307)
@@ -412,7 +412,7 @@
                                $like_clauses = array();
                                switch($search_type){
                                        default:
-                                               $like_clauses[] = 
"controller_procedure.title $this->like $like_pattern";
+                                               $like_clauses[] = 
"procedure.title $this->like $like_pattern";
                                                break;
                                }
                                if(count($like_clauses))
@@ -422,7 +422,7 @@
                        }
 
                        $filter_clauses = array();
-                       $filter_clauses[] = "controller_procedure.end_date IS 
NULL";
+                       $filter_clauses[] = "procedure.end_date IS NULL";
                        /*
                        switch($filters['is_active']){
                                case "non_active":
@@ -436,11 +436,11 @@
 
                        if(isset($filters[$this->get_id_field_name()]))
                        {
-                               $filter_clauses[] = "controller_procedure.id = 
{$this->marshal($filters[$this->get_id_field_name()],'int')}";
+                               $filter_clauses[] = "procedure.id = 
{$this->marshal($filters[$this->get_id_field_name()],'int')}";
                        }
                        if(isset($filters['control_areas']))
                        {
-                               $filter_clauses[] = 
"controller_procedure.control_area_id = 
{$this->marshal($filters['control_areas'], 'int')}";
+                               $filter_clauses[] = "procedure.control_area_id 
= {$this->marshal($filters['control_areas'], 'int')}";
                        }
 
                        if(count($filter_clauses))
@@ -452,16 +452,17 @@
 
                        //$joins = " {$this->left_join} controller_control_area 
ON (controller_procedure.control_area_id = controller_control_area.id)";
 
-                       $tables = "controller_procedure";
+                       $tables = "controller_procedure procedure";
 
                        if($return_count) // We should only return a count
                        {
-                               $cols = 
'COUNT(DISTINCT(controller_procedure.id)) AS count';
+                               $cols = 'COUNT(DISTINCT(procedure.id)) AS 
count';
                        }
                        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, controller_procedure.control_area_id ";
+                               $cols .= "procedure.id, procedure.title, 
procedure.purpose, procedure.responsibility, procedure.description, 
procedure.reference, procedure.attachment, procedure.start_date, 
procedure.end_date, procedure.procedure_id, procedure.revision_no, 
procedure.revision_date, procedure.control_area_id ";
                        }
+                       //var_dump($sort_field);
                        $dir = $ascending ? 'ASC' : 'DESC';
                        $order = $sort_field ? "ORDER BY 
{$this->marshal($sort_field, 'field')} $dir ": '';
 

Modified: trunk/controller/inc/class.uiprocedure.inc.php
===================================================================
--- trunk/controller/inc/class.uiprocedure.inc.php      2012-05-08 06:45:50 UTC 
(rev 9306)
+++ trunk/controller/inc/class.uiprocedure.inc.php      2012-05-08 08:12:58 UTC 
(rev 9307)
@@ -140,7 +140,7 @@
                                                array(
                                                        'key' => 'title',
                                                        'label' => 
lang('Procedure title'),
-                                                       'sortable'      => false
+                                                       'sortable'      => true
                                                ),
                                                array(
                                                        'key' => 'purpose',
@@ -466,10 +466,15 @@
                                /*
                                 * hack to fix display of   char 
                                 */
+                               
                                
$procedure->set_description(str_replace(" ", " 
",$procedure->get_description()));
                                
$procedure->set_responsibility(str_replace(' ', ' ', 
$procedure->get_responsibility()));
                                $procedure->set_reference(str_replace(' ', 
' ', $procedure->get_reference()));
-                               
+/*
+                               
$procedure->set_description(htmlspecialchars_decode($procedure->get_description()));
+                               
$procedure->set_responsibility(htmlspecialchars_decode($procedure->get_responsibility()));
+                               
$procedure->set_reference(htmlspecialchars_decode($procedure->get_reference()));
+*/                             
 
                                $procedure_array = $procedure->toArray();
                                if($procedure->get_start_date() && 
$procedure->get_start_date() != null)

Modified: trunk/controller/templates/base/procedure/procedure_item.xsl
===================================================================
--- trunk/controller/templates/base/procedure/procedure_item.xsl        
2012-05-08 06:45:50 UTC (rev 9306)
+++ trunk/controller/templates/base/procedure/procedure_item.xsl        
2012-05-08 08:12:58 UTC (rev 9307)
@@ -213,7 +213,7 @@
        
        <xsl:template match="options">
                <option value="{id}">
-                       <xsl:if test="selected != 0">
+                       <xsl:if test="selected">
                                <xsl:attribute name="selected" value="selected" 
/>
                        </xsl:if>
                        <xsl:value-of disable-output-escaping="yes" 
select="name"/>