[Fmsystem-commits] [8648]

[Erik Holm-Larsen]

Revision: 8648
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8648
Author:   erikhl
Date:     2012-01-23 10:20:41 +0000 (Mon, 23 Jan 2012)
Log Message:
-----------


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

Modified: trunk/activitycalendar/inc/class.soactivity.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.soactivity.inc.php 2012-01-23 07:28:36 UTC 
(rev 8647)
+++ trunk/activitycalendar/inc/class.soactivity.inc.php 2012-01-23 10:20:41 UTC 
(rev 8648)
@@ -639,6 +639,7 @@
        
        function get_activities()
        {
+               //fromdate -> innparam for uthenting av delta - timestamp
                $activities = array();
                $sql = "SELECT * FROM activity_activity where state=3";
                $this->db->query($sql, __LINE__, __FILE__);
@@ -1224,10 +1225,11 @@
                {
                        $sql = "SELECT * FROM activity_activity WHERE new_org 
AND organization_id={$org_id}";
                }
+               //var_dump($sql);
                $this->db->query($sql, __LINE__, __FILE__);
                while ($this->db->next_record())
                {                       
-               $activity = new activitycalendar_activity((int) $activity_id);
+                       $activity = new activitycalendar_activity((int) 
$this->db->f('id'));
 
                        
$activity->set_title($this->unmarshal($this->db->f('title'), 'string'));
                        
$activity->set_organization_id($this->unmarshal($this->db->f('organization_id'),
 'int'));
@@ -1261,6 +1263,10 @@
                                $contacts = 
activitycalendar_soorganization::get_instance()->get_contacts($activity->get_organization_id());
                                $activity->set_contact_persons($contacts);
                        }
+                       
+                       $activities[] = $activity;
                }
+               
+               return $activities;
        }
 }

Modified: trunk/activitycalendar/inc/class.uiorganization.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.uiorganization.inc.php     2012-01-23 
07:28:36 UTC (rev 8647)
+++ trunk/activitycalendar/inc/class.uiorganization.inc.php     2012-01-23 
10:20:41 UTC (rev 8648)
@@ -314,7 +314,8 @@
                                        $message = lang('messages_saved_form'); 
                                        
                                        //get affected activities and update 
with new org id
-                                       $update_activities = 
$so_activity->get_activities_for_update($new_org_id);
+                                       $update_activities = 
$so_activity->get_activities_for_update($id);
+                                       //var_dump($update_activities);
                                        foreach($update_activities as $act)
                                        {
                                                
$act->set_organization_id($new_org_id);