[Fmsystem-commits] [14348] lock to spesified activity subtree in case of preselected resource

[Sigurd Nes]

Revision: 14348
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14348
Author:   sigurdne
Date:     2015-11-13 09:13:58 +0000 (Fri, 13 Nov 2015)
Log Message:
-----------
lock to spesified activity subtree in case of preselected resource

Modified Paths:
--------------
    branches/dev-syncromind/booking/inc/class.boactivity.inc.php
    branches/dev-syncromind/booking/inc/class.uiapplication.inc.php

Modified: branches/dev-syncromind/booking/inc/class.boactivity.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.boactivity.inc.php        
2015-11-13 08:14:15 UTC (rev 14347)
+++ branches/dev-syncromind/booking/inc/class.boactivity.inc.php        
2015-11-13 09:13:58 UTC (rev 14348)
@@ -26,7 +26,7 @@
                        }
                }
 
-               function fetch_activities()
+               function fetch_activities($parent_id = 0)
                {
                        $activities = $this->so->read(array());
                        $activities = $activities['results'];
@@ -45,6 +45,10 @@
                        $result = array();
                        foreach($children[null] as $child)
                        {
+                               if($parent_id && $child['id'] != $parent_id)
+                               {
+                                       continue;
+                               }
                                $this->tree_walker($result, $children, '', 
$child);
                        }
                        usort($result, 'node_sort');

Modified: branches/dev-syncromind/booking/inc/class.uiapplication.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uiapplication.inc.php     
2015-11-13 08:14:15 UTC (rev 14347)
+++ branches/dev-syncromind/booking/inc/class.uiapplication.inc.php     
2015-11-13 09:13:58 UTC (rev 14348)
@@ -751,6 +751,13 @@
                        $this->flash_form_errors($errors);
                        $application['resources_json'] = 
json_encode(array_map('intval', $application['resources']));
                        $application['accepted_documents_json'] = 
json_encode($application['accepted_documents']);
+                       if(!$activity_id)
+                       {
+                               $activity_id = phpgw::get_var('activity_id', 
'int', 'REQUEST', -1);
+                       }
+                       $activity_path   = 
$this->activity_bo->get_path($activity_id);
+                       $top_level_activity = $activity_path ? 
$activity_path[0]['id'] : -1;
+                       $filter_activity_top = 0;
                        if ($GLOBALS['phpgw_info']['flags']['currentapp'] == 
'booking')
                        {
                                $application['cancel_link'] = 
self::link(array('menuaction' => 'booking.uiapplication.index'));
@@ -758,15 +765,10 @@
                        else if ($GLOBALS['phpgw_info']['flags']['currentapp'] 
== 'bookingfrontend')
                        {
                                $application['cancel_link'] = 
self::link(array('menuaction' => 'bookingfrontend.uibuilding.schedule', 'id' => 
phpgw::get_var('building_id', 'GET')));
+                               $filter_activity_top = $top_level_activity > 0 
? $top_level_activity : 0;
                        }
-                       if(!$activity_id)
-                       {
-                               $activity_id = phpgw::get_var('activity_id', 
'int', 'REQUEST', -1);
-                       }
-                       $activity_path   = 
$this->activity_bo->get_path($activity_id);
-                       $top_level_activity = $activity_path ? 
$activity_path[0]['id'] : -1;
-                        array_set_default($application, 'activity_id', 
$activity_id);
-                       $activities = $this->activity_bo->fetch_activities();
+                       array_set_default($application, 'activity_id', 
$activity_id);
+                       $activities = 
$this->activity_bo->fetch_activities($filter_activity_top);
                        $activities = $activities['results'];
                        $agegroups = 
$this->agegroup_bo->fetch_age_groups($top_level_activity);
                        $agegroups = $agegroups['results'];