[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [15292] Stable: Merge 15289:15291 from trunk
From: |
sigurdne |
Subject: |
[Fmsystem-commits] [15292] Stable: Merge 15289:15291 from trunk |
Date: |
Thu, 16 Jun 2016 07:33:22 +0000 (UTC) |
Revision: 15292
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15292
Author: sigurdne
Date: 2016-06-16 07:33:22 +0000 (Thu, 16 Jun 2016)
Log Message:
-----------
Stable: Merge 15289:15291 from trunk
Modified Paths:
--------------
branches/Version-2_0-branch/controller/inc/class.menu.inc.php
branches/Version-2_0-branch/rental/inc/class.menu.inc.php
Property Changed:
----------------
branches/Version-2_0-branch/
Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/dev-syncromind:13653
/branches/dev-syncromind-2:14937-15027,15165-15215,15223-15228,15230-15243,15245-15250,15254-15257
/branches/stavangerkommune:12743-12875,12986
/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288
+ /branches/dev-syncromind:13653
/branches/dev-syncromind-2:14937-15027,15165-15215,15223-15228,15230-15243,15245-15250,15254-15257
/branches/stavangerkommune:12743-12875,12986
/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291
Modified: branches/Version-2_0-branch/controller/inc/class.menu.inc.php
===================================================================
--- branches/Version-2_0-branch/controller/inc/class.menu.inc.php
2016-06-16 07:32:06 UTC (rev 15291)
+++ branches/Version-2_0-branch/controller/inc/class.menu.inc.php
2016-06-16 07:33:22 UTC (rev 15292)
@@ -36,14 +36,24 @@
$incoming_app =
$GLOBALS['phpgw_info']['flags']['currentapp'];
$GLOBALS['phpgw_info']['flags']['currentapp'] =
'controller';
$menus = array();
+ $config = CreateObject('phpgwapi.config', 'controller');
+ $config->read();
+ if (isset($config->config_data['home_alternative']) &&
$config->config_data['home_alternative'])
+ {
+ $main = 'controller.uicomponent.index';
+ }
+ else
+ {
+ $main = 'controller.uicontrol.control_list';
+ }
+
$menus['navbar'] = array
(
'controller' => array
(
'text' => lang('Controller'),
- // 'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicontrol.control_list')),
- 'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicomponent.index')),
+ 'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => $main)),
'image' => array('property',
'location'),
'order' => 10,
'group' => 'office'
@@ -56,13 +66,10 @@
$menus['navigation']['control'] = array(
'text' => lang('Control types'),
'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicontrol.control_list')),
- 'image' => array('property',
'location_1'));
+ 'image' => array('property',
'location_1')
+ );
-
- $config = CreateObject('phpgwapi.config',
'controller');
- $config->read();
-
if
(!isset($config->config_data['home_alternative']) ||
!$config->config_data['home_alternative'])
{
Modified: branches/Version-2_0-branch/rental/inc/class.menu.inc.php
===================================================================
--- branches/Version-2_0-branch/rental/inc/class.menu.inc.php 2016-06-16
07:32:06 UTC (rev 15291)
+++ branches/Version-2_0-branch/rental/inc/class.menu.inc.php 2016-06-16
07:33:22 UTC (rev 15292)
@@ -118,11 +118,6 @@
$menus['navigation'] = array
(
- 'application' => array(
- 'text' => lang('application'),
- 'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'rental.uiapplication.index')),
- 'image' => array('rental',
'text-x-generic'),
- ),
'contracts' => array
(
'text' => lang('contracts'),
@@ -144,6 +139,18 @@
)
);
+ //temporary check
+ if(!$use_fellesdata)
+ {
+ $menus['navigation'] =
array_reverse($menus['navigation'], true);
+ $menus['navigation']['application'] = array(
+ 'text' => lang('application'),
+ 'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'rental.uiapplication.index')),
+ 'image' => array('rental',
'text-x-generic'),
+ );
+ $menus['navigation'] =
array_reverse($menus['navigation'], true);
+ }
+
if ($use_fellesdata)
{
$menus['navigation']['parties']['children'] =
$sub_parties;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [15292] Stable: Merge 15289:15291 from trunk,
sigurdne <=