[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [7079] Merge 7077:7078 from trunk
From: |
Sigurd Nes |
Subject: |
[Fmsystem-commits] [7079] Merge 7077:7078 from trunk |
Date: |
Mon, 07 Mar 2011 15:22:12 +0000 |
Revision: 7079
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7079
Author: sigurdne
Date: 2011-03-07 15:22:11 +0000 (Mon, 07 Mar 2011)
Log Message:
-----------
Merge 7077:7078 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/property/inc/class.menu.inc.php
branches/Version-1_0-branch/property/inc/class.uiproject.inc.php
Property Changed:
----------------
branches/Version-1_0-branch/
Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076
+
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078
Modified: branches/Version-1_0-branch/property/inc/class.menu.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.menu.inc.php 2011-03-07
15:21:21 UTC (rev 7078)
+++ branches/Version-1_0-branch/property/inc/class.menu.inc.php 2011-03-07
15:22:11 UTC (rev 7079)
@@ -653,6 +653,24 @@
if ( $acl->check('.project', PHPGW_ACL_READ,
'property') )
{
+
+ $cats = CreateObject('phpgwapi.categories',
-1, 'property', '.project');
+ $cats->supress_info = true;
+
+ $project_cats =
$cats->formatted_xslt_list(array('format'=>'filter','globals' => True));
+//_debug_array($project_cats);die();
+ $project_children = array();
+ foreach($project_cats['cat_list'] as $dummy =>
$project_cat)
+ {
+
$project_children[$project_cat['cat_id']] = array
+ (
+ 'url' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'property.uiproject.index', 'cat_id' => $project_cat['cat_id'])),
+ 'text' =>
$project_cat['name'],
+ 'image' =>
array('property', 'project'),
+
+ );
+ }
+
$menus['navigation']['project'] = array
(
'url' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'property.uiproject.index')),
@@ -664,7 +682,8 @@
(
'url' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'property.uiproject.index')),
'text' =>
lang('Project'),
- 'image'
=> array('property', 'project')
+ 'image'
=> array('property', 'project'),
+ 'children'
=> $project_children
),
'workorder' => array
(
Modified: branches/Version-1_0-branch/property/inc/class.uiproject.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uiproject.inc.php
2011-03-07 15:21:21 UTC (rev 7078)
+++ branches/Version-1_0-branch/property/inc/class.uiproject.inc.php
2011-03-07 15:22:11 UTC (rev 7079)
@@ -167,6 +167,11 @@
function index()
{
$GLOBALS['phpgw_info']['flags']['menu_selection'] .=
'::project';
+ if($this->cat_id)
+ {
+
$GLOBALS['phpgw_info']['flags']['menu_selection'] .= "::{$this->cat_id}";
+ }
+
if(!$this->acl_read)
{
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
'property.uiproject.stop', 'perm'=>1,'acl_location'=> $this->acl_location));
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [7079] Merge 7077:7078 from trunk,
Sigurd Nes <=