[Fmsystem-commits] [7978]

[Erik Holm-Larsen]

Revision: 7978
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7978
Author:   erikhl
Date:     2011-11-01 12:26:37 +0000 (Tue, 01 Nov 2011)
Log Message:
-----------


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-01 12:18:59 UTC 
(rev 7977)
+++ trunk/activitycalendar/inc/class.soactivity.inc.php 2011-11-01 12:26:37 UTC 
(rev 7978)
@@ -364,7 +364,7 @@
                        
$activity->set_title($this->unmarshal($this->db->f('title'), 'string'));
                        
$activity->set_organization_id($this->unmarshal($this->db->f('organization_id'),
 'int'));
                        
$activity->set_group_id($this->unmarshal($this->db->f('group_id'), 'int'));
-                       
$activity->set_district($this->unmarshal($this->db->f('district'), 'int'));
+                       
$activity->set_district($this->unmarshal($this->db->f('district'), 'string'));
                        
$activity->set_office($this->unmarshal($this->db->f('office'), 'int'));
                        
$activity->set_category($this->unmarshal($this->db->f('category'), 'int'));
                        
$activity->set_state($this->unmarshal($this->db->f('state'), 'int'));

Modified: trunk/activitycalendar/inc/model/class.activity.inc.php
===================================================================
--- trunk/activitycalendar/inc/model/class.activity.inc.php     2011-11-01 
12:18:59 UTC (rev 7977)
+++ trunk/activitycalendar/inc/model/class.activity.inc.php     2011-11-01 
12:26:37 UTC (rev 7978)
@@ -284,12 +284,14 @@
                                $arena_name = 
activitycalendar_soarena::get_instance()->get_arena_name($this->get_arena());
                        }
                        
+                       $activity_district = 
activitycalendar_soactivity::get_instance()->get_district_name($this->get_district());
+                       
                        return array(
                                'id' => $this->get_id(),
                                'title' => $this->get_title(),
                                'organization_id' => $org_name,
                                'group_id' => 
activitycalendar_sogroup::get_instance()->get_group_name($this->get_group_id()),
-                               'district' => 
activitycalendar_soactivity::get_instance()->get_district_name($this->get_district()),
+                               'district' => $activity_district,
                                'office' => 
activitycalendar_soactivity::get_instance()->get_office_name($this->get_office()),
                                'category' => 
$this->get_so()->get_category_name($this->get_category()),
                                'state' => lang('state_'.$this->get_state()),