[Fmsystem-commits] [8172]

[Erik Holm-Larsen]

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


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

Modified: trunk/activitycalendar/inc/class.uiactivities.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.uiactivities.inc.php       2011-11-23 
11:26:15 UTC (rev 8171)
+++ trunk/activitycalendar/inc/class.uiactivities.inc.php       2011-11-23 
12:47:26 UTC (rev 8172)
@@ -153,7 +153,7 @@
                }
                else
                {
-                       $organizations = $so_org->get(null, null, null, null, 
null, null, null);
+                       $organizations = $so_org->get(null, null, 'org.name', 
true, null, null, null);
                }
                $groups = activitycalendar_sogroup::get_instance()->get(null, 
null, null, null, null, null, null);
 

Modified: trunk/activitycalendar/inc/model/class.activity.inc.php
===================================================================
--- trunk/activitycalendar/inc/model/class.activity.inc.php     2011-11-23 
11:26:15 UTC (rev 8171)
+++ trunk/activitycalendar/inc/model/class.activity.inc.php     2011-11-23 
12:47:26 UTC (rev 8172)
@@ -251,6 +251,7 @@
                                $contact_1 = 
activitycalendar_socontactperson::get_instance()->get_group_contact_name($this->get_contact_person_1());
                                $contact_2 = 
activitycalendar_socontactperson::get_instance()->get_group_contact_name($this->get_contact_person_2());
                                $desc = 
activitycalendar_sogroup::get_instance()->get_description($this->get_group_id());
+                               $org_name = 
activitycalendar_soorganization::get_instance()->get_organization_name($this->get_organization_id());
                        }
                        else if(isset($this->organization_id) && 
$this->get_organization_id() > 0)
                        {