[Fmsystem-commits] [7695]

[Erik Holm-Larsen]

Revision: 7695
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7695
Author:   erikhl
Date:     2011-09-22 06:52:11 +0000 (Thu, 22 Sep 2011)
Log Message:
-----------


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

Modified: trunk/activitycalendar/inc/class.soactivity.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.soactivity.inc.php 2011-09-21 16:14:51 UTC 
(rev 7694)
+++ trunk/activitycalendar/inc/class.soactivity.inc.php 2011-09-22 06:52:11 UTC 
(rev 7695)
@@ -938,6 +938,7 @@
                        $city = '';
                }
                $district = $org_info['district'];
+               $status = $org_info['status'];
                
                $columns[] = 'name';
                $columns[] = 'homepage';
@@ -949,6 +950,7 @@
                //$columns[] = 'city';
                $columns[] = 'orgno';
                $columns[] = 'district';
+               $columns[] = 'change_type';
                $cols = implode(',',$columns);
                
                $values[] = "'{$name}'";
@@ -961,6 +963,7 @@
                //$values[] = "'{$city}'";
                $values[] = "'{$orgnr}'";
                $values[] = "'{$district}'";
+               $values[] = "'{$status}'";
                $vals = implode(',',$values);
                
                //var_dump("INSERT INTO activity_organization ({$cols}) VALUES 
({$vals})");
@@ -1015,15 +1018,18 @@
                $name = $group_info['name'];
                $orgid = $group_info['organization_id'];
                $description = $group_info['description'];
+               $status = $group_info['status'];
                
                $columns[] = 'name';
                $columns[] = 'description';
                $columns[] = 'organization_id';
+               $columns[] = 'change_type';
                $cols = implode(',',$columns);
                
                $values[] = "'{$name}'";
                $values[] = "'{$description}'";
                $values[] = "'{$orgid}'";
+               $values[] = "'{$status}'";
                $vals = implode(',',$values);
                
                $sql = "INSERT INTO activity_group ({$cols}) VALUES ({$vals})";

Modified: trunk/activitycalendarfrontend/inc/class.uiactivity.inc.php
===================================================================
--- trunk/activitycalendarfrontend/inc/class.uiactivity.inc.php 2011-09-21 
16:14:51 UTC (rev 7694)
+++ trunk/activitycalendarfrontend/inc/class.uiactivity.inc.php 2011-09-22 
06:52:11 UTC (rev 7695)
@@ -133,6 +133,7 @@
                                        $org_info['street'] = 
phpgw::get_var('address') . ' ' . phpgw::get_var('number') . ', ' . 
phpgw::get_var('postaddress');
                                        //$org_info['zip'] = 
phpgw::get_var('postaddress');
                                        $org_info['district'] = 
phpgw::get_var('org_district'); 
+                                       $org_info['status'] = "new";
                                        $o_id = 
$so_activity->add_organization_local($org_info);
                                        
                                        //add contact persons
@@ -163,6 +164,7 @@
                                                $group_info['name'] = 
phpgw::get_var('groupname');
                                                $group_info['organization_id'] 
= $o_id;
                                                $group_info['description'] = 
phpgw::get_var('group_description');
+                                               $group_info['status'] = "new";
                                                $g_id = 
$so_activity->add_group_local($group_info);
                                                
                                                //add contact persons
@@ -200,7 +202,7 @@
                                        var_dump("lagre1");
                                        $old_state = $activity->get_state();
                                        $new_state = phpgw::get_var('state');
-       var_dump("lagre2");
+//     var_dump("lagre2");
                                        // ... set all parameters
                                        
$activity->set_title(phpgw::get_var('title'));
                                        
//$activity->set_organization_id(phpgw::get_var('organization_id'));
@@ -220,7 +222,7 @@
                                        {
                                                
$activity->set_state($new_state);
                                        }
-                                       var_dump("lagre3");
+//                                     var_dump("lagre3");
                                        
$activity->set_category(phpgw::get_var('category'));
                                        $target_array = 
phpgw::get_var('target');
                                        $activity->set_target(implode(",", 
$target_array));
@@ -229,7 +231,7 @@
                                        
$activity->set_contact_persons($persons);
                                        
$activity->set_special_adaptation(phpgw::get_var('special_adaptation'));
                                        
-                                       var_dump("storing"); 
+//                                     var_dump("storing"); 
                                        
                                        if($so_activity->store($activity)) // 
... and then try to store the object
                                        {