[Fmsystem-commits] [7272] fixed import and display of multiple targets on an activity

[Erik Holm-Larsen]

Revision: 7272
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7272
Author:   erikhl
Date:     2011-05-09 09:53:54 +0000 (Mon, 09 May 2011)
Log Message:
-----------
fixed import and display of multiple targets on an activity

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

Modified: trunk/activitycalendar/inc/class.uiimport.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.uiimport.inc.php   2011-05-09 08:55:35 UTC 
(rev 7271)
+++ trunk/activitycalendar/inc/class.uiimport.inc.php   2011-05-09 09:53:54 UTC 
(rev 7272)
@@ -243,11 +243,17 @@
                                        }
                                }
                                $activity_target = $this->decode($data[6]);
+                               //var_dump($activity_target);
                                if($activity_target)
                                {
                                        $act_target_array = explode(",", 
$activity_target);
-                                       $activity_target = 
$soactivity->get_target_from_sort_id($act_target_array[0]);
+                                       foreach($act_target_array as $at)
+                                       {
+                                               $act_targets[] = 
$soactivity->get_target_from_sort_id($at);
+                                       }
+                                       $activity_target = implode(",", 
$act_targets);
                                }
+                               unset($act_targets);
                                $activity_day = $this->decode($data[9]);
                                $activity_time = $this->decode($data[10]);
                                $activity_update_date = 
$this->decode($data[20]);

Modified: trunk/activitycalendar/templates/base/activity.php
===================================================================
--- trunk/activitycalendar/templates/base/activity.php  2011-05-09 08:55:35 UTC 
(rev 7271)
+++ trunk/activitycalendar/templates/base/activity.php  2011-05-09 09:53:54 UTC 
(rev 7272)
@@ -211,7 +211,12 @@
                                        else
                                        {
                                                if($activity->get_target()){
-                                                       echo 
$act_so->get_target_name($activity->get_target());
+                                                       $current_target_ids = 
$activity->get_target();
+                                                       
$current_target_id_array=explode(",", $current_target_ids);
+                                                       
foreach($current_target_id_array as $curr_target)
+                                                       {
+                                                               echo 
$act_so->get_target_name($curr_target).'<br/>';
+                                                       }
                                                }
                                        }
                                        ?>