[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [17294] more on controller, location mode
From: |
sigurdne |
Subject: |
[Fmsystem-commits] [17294] more on controller, location mode |
Date: |
Fri, 10 Nov 2017 10:00:28 -0500 (EST) |
Revision: 17294
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17294
Author: sigurdne
Date: 2017-11-10 10:00:28 -0500 (Fri, 10 Nov 2017)
Log Message:
-----------
more on controller, location mode
Modified Paths:
--------------
trunk/controller/inc/class.uicomponent.inc.php
Modified: trunk/controller/inc/class.uicomponent.inc.php
===================================================================
--- trunk/controller/inc/class.uicomponent.inc.php 2017-11-10 11:52:31 UTC
(rev 17293)
+++ trunk/controller/inc/class.uicomponent.inc.php 2017-11-10 15:00:28 UTC
(rev 17294)
@@ -142,7 +142,7 @@
}
}
- private function get_location_filter()
+ private function get_location_filter($get_locations = false)
{
$entity_group_id = phpgw::get_var('entity_group_id',
'int');
$location_id = phpgw::get_var('location_id', 'int');
@@ -156,7 +156,7 @@
{
$location_filter = array();
- if ($this->is_location($location_id))
+ if ($this->is_location($location_id) ||
$get_locations)
{
$location_types =
CreateObject('property.soadmin_location')->read(array('allrows' => true));
foreach ($location_types as
$location_type)
@@ -660,7 +660,7 @@
// Gets timestamp of first day in next year
$to_date_ts =
execMethod('controller.uicalendar.get_end_date_year_ts', $year);
- $location_filter = $this->get_location_filter();
+ $location_filter =
$this->get_location_filter($get_locations);
foreach ($location_filter as $_location)
{
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [17294] more on controller, location mode,
sigurdne <=