fmsystem-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Fmsystem-commits] [9889] Fixed transfer of organization to booking


From: Erik Holm-Larsen
Subject: [Fmsystem-commits] [9889] Fixed transfer of organization to booking
Date: Tue, 21 Aug 2012 07:46:28 +0000

Revision: 9889
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9889
Author:   erikhl
Date:     2012-08-21 07:46:28 +0000 (Tue, 21 Aug 2012)
Log Message:
-----------
Fixed transfer of organization to booking

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

Modified: trunk/activitycalendar/inc/class.soorganization.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.soorganization.inc.php     2012-08-21 
07:37:50 UTC (rev 9888)
+++ trunk/activitycalendar/inc/class.soorganization.inc.php     2012-08-21 
07:46:28 UTC (rev 9889)
@@ -738,7 +738,7 @@
                {
                        $district = '';
                }
-               $activity_id = $org_info['activity_id'];
+               $activity_id = 1;
                $show_in_portal = 1; 
                
                $values = array(
@@ -754,7 +754,7 @@
                        'activity_id = ' . $this->marshal($activity_id, 'int'),
                        'show_in_portal = 1'
                );
-               
+
                $result = $this->db->query('UPDATE bb_organization SET ' . 
join(',', $values) . " WHERE id=$orgid", __LINE__,__FILE__);
        }
        

Modified: trunk/activitycalendar/inc/class.uiorganization.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.uiorganization.inc.php     2012-08-21 
07:37:50 UTC (rev 9888)
+++ trunk/activitycalendar/inc/class.uiorganization.inc.php     2012-08-21 
07:46:28 UTC (rev 9889)
@@ -176,7 +176,6 @@
                        else if(isset($_POST['update_organization'])) // The 
user has pressed the store button
                        {
                                $original_org_id = 
phpgw::get_var('original_org_id');
-                               $org_info['orgid'] = $original_org_id;
                                $orgno = phpgw::get_var('orgno');
                                $district = phpgw::get_var('org_district');
                                $homepage = phpgw::get_var('homepage');
@@ -185,8 +184,6 @@
                                $address = phpgw::get_var('address');
                                 $zip = phpgw::get_var('zip_code');
                                 $city = phpgw::get_var('city');
-                               //phpgw::get_var('address') . ' ' . 
phpgw::get_var('number') . ', ' . phpgw::get_var('postaddress');
-                               //$address_array = explode(",",$address_tmp);
                                $desc = phpgw::get_var('org_description');
                                
                                $org_info = array();
@@ -207,6 +204,7 @@
                                 $org_info['city'] = $city;
                                $org_info['activity_id'] = '';
                                $org_info['district'] = $district;
+                                $org_info['orgid'] = $original_org_id;
                                
                                $contact1_id = phpgw::get_var('contact1_id');
                                $contact2_id = phpgw::get_var('contact2_id');




reply via email to

[Prev in Thread] Current Thread [Next in Thread]