[Fmsystem-commits] [9337]

[Erik Holm-Larsen]

Revision: 9337
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9337
Author:   erikhl
Date:     2012-05-09 12:24:40 +0000 (Wed, 09 May 2012)
Log Message:
-----------


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

Modified: trunk/activitycalendar/inc/class.soactivity.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.soactivity.inc.php 2012-05-09 12:09:26 UTC 
(rev 9336)
+++ trunk/activitycalendar/inc/class.soactivity.inc.php 2012-05-09 12:24:40 UTC 
(rev 9337)
@@ -471,12 +471,12 @@
                        {
                                if($activity->get_new_org())
                                {
-                                       $contacts = 
activitycalendar_soorganization::get_instance()->get_contacts($activity->get_organization_id());
+                                       $contacts = 
activitycalendar_soorganization::get_instance()->get_contacts_local($activity->get_organization_id());
                                        
$activity->set_contact_persons($contacts);
                                }
                                else
                                {
-                                       $contacts = 
activitycalendar_soorganization::get_instance()->get_contacts_local($activity->get_organization_id());
+                                       $contacts = 
activitycalendar_soorganization::get_instance()->get_contacts($activity->get_organization_id());
                                        
$activity->set_contact_persons($contacts);
                                }
                        }

Modified: trunk/activitycalendar/templates/base/activity.php
===================================================================
--- trunk/activitycalendar/templates/base/activity.php  2012-05-09 12:09:26 UTC 
(rev 9336)
+++ trunk/activitycalendar/templates/base/activity.php  2012-05-09 12:24:40 UTC 
(rev 9337)
@@ -443,7 +443,14 @@
                                        else
                                        {
                                                
if($activity->get_organization_id()){
-                                                       echo 
activitycalendar_soorganization::get_instance()->get_organization_name($activity->get_organization_id());
+                                                       
if($activity->get_new_org())
+                                                       {
+                                                               echo 
activitycalendar_soorganization::get_instance()->get_organization_name_local($activity->get_organization_id());
+                                                       }
+                                                       else
+                                                       {
+                                                               echo 
activitycalendar_soorganization::get_instance()->get_organization_name($activity->get_organization_id());
+                                                       }
                                                }
                                        }
                                        ?>
@@ -496,7 +503,10 @@
                                                }
                                                else 
if($activity->get_organization_id())
                                                {
-                                                       echo 
$contpers_so->get_org_contact_name($activity->get_contact_person_1());
+                                                       
if($activity->get_new_org())
+                                                               echo 
$contpers_so->get_org_contact_name_local($activity->get_contact_person_1());
+                                                       else
+                                                               echo 
$contpers_so->get_org_contact_name($activity->get_contact_person_1());
                                                }
                                        ?>
                                </dd>
@@ -513,7 +523,10 @@
                                                }
                                                else 
if($activity->get_organization_id())
                                                {
-                                                       echo 
$contpers_so->get_org_contact_name($activity->get_contact_person_2());
+                                                       
if($activity->get_new_org())
+                                                               echo 
$contpers_so->get_org_contact_name_local($activity->get_contact_person_2());
+                                                       else
+                                                               echo 
$contpers_so->get_org_contact_name($activity->get_contact_person_2());
                                                }
                                        ?>
                                </dd>