[Fmsystem-commits] [15289] Stable: Merge 15286:15288 from trunk

[sigurdne]

Revision: 15289
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15289
Author:   sigurdne
Date:     2016-06-14 13:13:09 +0000 (Tue, 14 Jun 2016)
Log Message:
-----------
Stable: Merge 15286:15288 from trunk

Modified Paths:
--------------
    branches/Version-2_0-branch/booking/inc/class.uibuilding.inc.php
    branches/Version-2_0-branch/booking/inc/class.uiresource.inc.php
    branches/Version-2_0-branch/property/inc/class.uitts.inc.php

Property Changed:
----------------
    branches/Version-2_0-branch/
    branches/Version-2_0-branch/booking/


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
   + /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


Property changes on: branches/Version-2_0-branch/booking
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/stavangerkommune/booking:9468-12740,12743-12875,12986
/trunk/booking:14721-14732,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14871,14886-14896,14900-14902,14917-14919,14924-14978,14980-15258,15266-15285
   + /branches/stavangerkommune/booking:9468-12740,12743-12875,12986
/trunk/booking:14721-14732,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14871,14886-14896,14900-14902,14917-14919,14924-14978,14980-15258,15266-15285,15287-15288

Modified: branches/Version-2_0-branch/booking/inc/class.uibuilding.inc.php
===================================================================
--- branches/Version-2_0-branch/booking/inc/class.uibuilding.inc.php    
2016-06-14 13:11:23 UTC (rev 15288)
+++ branches/Version-2_0-branch/booking/inc/class.uibuilding.inc.php    
2016-06-14 13:13:09 UTC (rev 15289)
@@ -307,6 +307,9 @@
                public function schedule()
                {
                        $building = 
$this->bo->get_schedule(phpgw::get_var('id', 'int'), "booking.uibuilding");
+
+                       $GLOBALS['phpgw_info']['flags']['app_header'] = 
lang('booking') . "::{$building['name']}";
+
                        $building['cancel_link'] = 
self::link(array('menuaction' => 'booking.uibuilding.show',
                                        'id' => $building['id']));
                        $building['datasource_url'] = self::link(array(

Modified: branches/Version-2_0-branch/booking/inc/class.uiresource.inc.php
===================================================================
--- branches/Version-2_0-branch/booking/inc/class.uiresource.inc.php    
2016-06-14 13:11:23 UTC (rev 15288)
+++ branches/Version-2_0-branch/booking/inc/class.uiresource.inc.php    
2016-06-14 13:13:09 UTC (rev 15289)
@@ -440,6 +440,19 @@
                public function schedule()
                {
                        $resource = 
$this->bo->get_schedule(phpgw::get_var('id', 'int'), 'booking.uibuilding', 
'booking.uiresource');
+
+                       $GLOBALS['phpgw_info']['flags']['app_header'] = 
lang('booking') . "::{$resource['name']}";
+                       $building_names = array();
+                       if(is_array($resource['buildings']))
+                       {
+                               foreach ($resource['buildings'] as $building_id)
+                               {
+                                       $building = 
$this->bo->read_single($building_id);
+                                       $building_names[] = $building['name'];
+                               }
+                               $GLOBALS['phpgw_info']['flags']['app_header'] 
.= ' (' . implode('',$building_names) . ')';
+                       }
+
                        $resource['application_link'] = self::link(array(
                                        'menuaction' => 
'booking.uiapplication.add',
                                        'building_id' => 
$resource['building_id'],

Modified: branches/Version-2_0-branch/property/inc/class.uitts.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.uitts.inc.php        
2016-06-14 13:11:23 UTC (rev 15288)
+++ branches/Version-2_0-branch/property/inc/class.uitts.inc.php        
2016-06-14 13:13:09 UTC (rev 15289)
@@ -2870,7 +2870,7 @@
                                $username       = 
$config->config_data['external_register']['username'];
                                $password       = 
$config->config_data['external_register']['password'];
                                $sub_check = 'objekt';
-                               return $this->check_external_register(array(
+                               $fullmakt = 
$this->check_external_register(array(
                                        'url'           => $url,
                                        'username'      => $username,
                                        'password'      => $password,
@@ -2878,12 +2878,20 @@
                                        'id'            => $id
                                        )
                                );
+
+                               /**
+                                * some magic...to decide $supervisor_lid
+                                */
+
+                               $supervisor_lid = 'hc483';
+                               $supervisor_id = 
$GLOBALS['phpgw']->accounts->name2id($supervisor_lid);
                        }
                        else
                        {
                                $supervisor_id = 
$GLOBALS['phpgw_info']['user']['preferences']['property']['approval_from'];
-                               return 
$this->get_supervisor_email($supervisor_id);
                        }
+
+                       return $this->get_supervisor_email($supervisor_id);
                }
 
                public function check_external_register($param)