[Fmsystem-commits] [8003] display of multiple districts in activity-datatable

[Erik Holm-Larsen]

Revision: 8003
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8003
Author:   erikhl
Date:     2011-11-03 09:07:07 +0000 (Thu, 03 Nov 2011)
Log Message:
-----------
display of multiple districts in activity-datatable

Modified Paths:
--------------
    trunk/activitycalendar/inc/class.soactivity.inc.php
    trunk/activitycalendar/inc/model/class.activity.inc.php

Modified: trunk/activitycalendar/inc/class.soactivity.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.soactivity.inc.php 2011-11-03 08:58:34 UTC 
(rev 8002)
+++ trunk/activitycalendar/inc/class.soactivity.inc.php 2011-11-03 09:07:07 UTC 
(rev 8003)
@@ -456,13 +456,14 @@
                $values = array();
                if($district_id != null)
                {
-                       $sql = "SELECT name FROM fm_part_of_town where 
part_of_town_id in ($district_id)";
+                       $sql = "SELECT district_id, name FROM fm_part_of_town 
where part_of_town_id in ($district_id)";
                        $this->db->query($sql, __LINE__, __FILE__);
                        while($this->db->next_record()){
                                $name = $this->db->f('name');
                                $values[] = $name;
+                               //$result .= $name . ',';
                        }
-                       $result = implode(",",$values);
+                       $result = implode(", ",$values);
                        return $result;
        }
        return "";

Modified: trunk/activitycalendar/inc/model/class.activity.inc.php
===================================================================
--- trunk/activitycalendar/inc/model/class.activity.inc.php     2011-11-03 
08:58:34 UTC (rev 8002)
+++ trunk/activitycalendar/inc/model/class.activity.inc.php     2011-11-03 
09:07:07 UTC (rev 8003)
@@ -284,7 +284,7 @@
                                $arena_name = 
activitycalendar_soarena::get_instance()->get_arena_name($this->get_arena());
                        }
                        
-                       $activity_district = 
activitycalendar_soactivity::get_instance()->get_district_name($this->get_district());
+                       $activity_district = 
$this->get_so()->get_district_name($this->get_district());
                        
                        return array(
                                'id' => $this->get_id(),