[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9049]
From: |
Erik Holm-Larsen |
Subject: |
[Fmsystem-commits] [9049] |
Date: |
Tue, 27 Mar 2012 12:13:01 +0000 |
Revision: 9049
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9049
Author: erikhl
Date: 2012-03-27 12:13:01 +0000 (Tue, 27 Mar 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/activitycalendar/inc/class.uiorganization.inc.php
trunk/activitycalendarfrontend/inc/class.uiactivity.inc.php
Modified: trunk/activitycalendar/inc/class.uiorganization.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.uiorganization.inc.php 2012-03-27
11:53:21 UTC (rev 9048)
+++ trunk/activitycalendar/inc/class.uiorganization.inc.php 2012-03-27
12:13:01 UTC (rev 9049)
@@ -167,10 +167,14 @@
$message = lang('messages_saved_form');
+ //get organization_id for the group:
+ $group_org_id =
$sogroup->get_orgid_from_group($new_group_id);
+
//get affected activities and update
with new org id
$update_activities =
$soactivity->get_activities_for_update($new_group_id, true);
foreach($update_activities as $act)
{
+
$act->set_organization_id($group_org_id);
$act->set_group_id($new_group_id);
$act->set_new_org(false);
$soactivity->store($act);
Modified: trunk/activitycalendarfrontend/inc/class.uiactivity.inc.php
===================================================================
--- trunk/activitycalendarfrontend/inc/class.uiactivity.inc.php 2012-03-27
11:53:21 UTC (rev 9048)
+++ trunk/activitycalendarfrontend/inc/class.uiactivity.inc.php 2012-03-27
12:13:01 UTC (rev 9049)
@@ -127,6 +127,7 @@
//$organization =
$this->so_organization->get_single($o_id);
$get_org_from_local = false;
+ $new_org_group = false;
$new_org = phpgw::get_var('new_org');
if($new_org != null && $new_org == 'yes')
{
@@ -178,6 +179,7 @@
$desc =
phpgw::get_var('org_description');
$organization =
$this->so_organization->get_organization_local($o_id);
$new_org = true;
+ $new_org_group = true;
//var_dump($organization);
}
else if(is_numeric($o_id) && $o_id > 0)
@@ -218,6 +220,7 @@
$group =
$this->so_group->get_group_local($g_id);
$person_ids =
$this->so_group->get_contacts_local($g_id);
$organization =
$this->so_organization->get_single($o_id);
+ $new_org_group = true;
}
else if(isset($g_id) &&
is_numeric($g_id) && $g_id > 0)
{
@@ -301,6 +304,7 @@
$activity->set_contact_persons($person_ids);
$activity->set_special_adaptation(phpgw::get_var('special_adaptation'));
$activity->set_frontend(true);
+ $activity->set_new_org($new_org_group);
$target_ok = false;
$district_ok = false;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9049],
Erik Holm-Larsen <=