[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [17024] Stable: Merge 17019:17023 from trunk
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [17024] Stable: Merge 17019:17023 from trunk |
|
Date: |
Fri, 1 Sep 2017 09:04:03 -0400 (EDT) |
Revision: 17024
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17024
Author: sigurdne
Date: 2017-09-01 09:04:02 -0400 (Fri, 01 Sep 2017)
Log Message:
-----------
Stable: Merge 17019:17023 from trunk
Modified Paths:
--------------
branches/Version-2_0-branch/booking/inc/class.boaccount_code_set.inc.php
branches/Version-2_0-branch/booking/inc/class.boallocation.inc.php
branches/Version-2_0-branch/booking/inc/class.bobooking.inc.php
branches/Version-2_0-branch/booking/inc/class.bobuilding.inc.php
branches/Version-2_0-branch/booking/inc/class.bocommon_authorized.inc.php
branches/Version-2_0-branch/booking/inc/class.bocommon_global_manager_authorized.inc.php
branches/Version-2_0-branch/booking/inc/class.bodocument.inc.php
branches/Version-2_0-branch/booking/inc/class.bodocument_resource.inc.php
branches/Version-2_0-branch/booking/inc/class.boevent.inc.php
branches/Version-2_0-branch/booking/inc/class.bogroup.inc.php
branches/Version-2_0-branch/booking/inc/class.boorganization.inc.php
branches/Version-2_0-branch/booking/inc/class.bopermission.inc.php
branches/Version-2_0-branch/booking/inc/class.bopermission_resource.inc.php
branches/Version-2_0-branch/booking/inc/class.bopermission_season.inc.php
branches/Version-2_0-branch/booking/inc/class.boresource.inc.php
branches/Version-2_0-branch/booking/inc/class.boseason.inc.php
branches/Version-2_0-branch/booking/inc/class.soallocation.inc.php
branches/Version-2_0-branch/booking/inc/class.sobooking.inc.php
branches/Version-2_0-branch/booking/inc/class.sopermission_permission_document_building.inc.php
branches/Version-2_0-branch/booking/inc/class.uicompleted_reservation_export.inc.php
branches/Version-2_0-branch/booking/templates/base/event_new.xsl
branches/Version-2_0-branch/booking/templates/base/group_edit.xsl
branches/Version-2_0-branch/controller/inc/class.uicontrol_item.inc.php
branches/Version-2_0-branch/eventplanner/inc/class.bocalendar.inc.php
branches/Version-2_0-branch/eventplanner/inc/class.sobooking.inc.php
branches/Version-2_0-branch/eventplanner/inc/class.socalendar.inc.php
branches/Version-2_0-branch/eventplanner/inc/class.uibooking.inc.php
branches/Version-2_0-branch/phpgwapi/js/jquery/jqTree/tree.jquery.js
branches/Version-2_0-branch/property/inc/class.botts.inc.php
branches/Version-2_0-branch/property/inc/class.sotts.inc.php
branches/Version-2_0-branch/property/inc/class.uitts.inc.php
branches/Version-2_0-branch/property/inc/cron/default/oppdater_betalte_faktura_BK.php
branches/Version-2_0-branch/property/inc/hook_config.inc.php
branches/Version-2_0-branch/property/setup/setup.inc.php
branches/Version-2_0-branch/property/setup/tables_current.inc.php
branches/Version-2_0-branch/property/setup/tables_update.inc.php
branches/Version-2_0-branch/property/templates/base/config.tpl
branches/Version-2_0-branch/property/templates/base/tts.xsl
Property Changed:
----------------
branches/Version-2_0-branch/
branches/Version-2_0-branch/booking/
Index: branches/Version-2_0-branch
===================================================================
--- branches/Version-2_0-branch 2017-09-01 12:28:15 UTC (rev 17023)
+++ branches/Version-2_0-branch 2017-09-01 13:04:02 UTC (rev 17024)
Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
/branches/dev-syncromind:13653
/branches/dev-syncromind-2:14933-16846
/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,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619,15621-15630,15632-15635,15637-15639,15641-15643,15645,15647-15665,15667-15668,15670-15671,15673-15693,15695-15712,15714-15764,15766-15767,15769-15787,15789-15802,15804-15811,15813-15814,15816-15818,15820-15849,15851-15887,15889-15900,15902-16046,16048-16051,16053,16055,16057-16063,16065-16071,16073-16077,16079-16081,16083-16099,16101-16130,16132-16140,16142,16144-16212,16214-16219,16221,16223-16224,16226,16228-16229,16231,16233,16235,16237,16239-16240,16242,16244-16246,16248,16250-16251,16253-16255,16257-16259,16261,16263,16265,16267,16269-16276,16278,16280-16283,16285,16287-16288,16290,16292-16295,16297-16305,16307-16314,16316-16318,16320-16322,16324,16326-16330,16332,16334,16336,16338-16339,16341-16342,16344,16346,16348,16350,16352-16353,16355-16358,16360,16362,16364-16369,16371,16373,16375-16378,16380,16382-16383,16385,16387,16389,16391,16393-16395,16397,16399-16402,16404,16406,16408,16410-16415,16417,16419-16420,16422-16425,16427,16429-16440,16442,16444,16446,16448-16449,16451,16453,16455-16463,16465-16472,16474-16475,16477-16484,16486,16488,16490-16497,16499,16501-16503,16505-16512,16514-16517,16519,16521,16523,16525,16527-16532,16534,16536-16541,16543,16545-16554,16556,16558-16565,16567-16575,16577-16584,16586-16588,16590,16592-16593,16595-16596,16598,16600-16601,16603-16608,16610-16614,16616-16618,16620-16621,16623-16624,16626,16628,16630,16632-16638,16640,16642,16644,16646-16651,16653-16663,16665,16667,16669,16671,16673,16675,16677,16679-16680,16682,16684,16686,16688-16692,16694-16695,16697-16699,16701,16703,16705-16706,16708,16710,16712,16714,16716-16718,16720-16728,16730-16732,16734-16739,16741,16743-16746,16748-16750,16752-16755,16757,16759-16761,16763,16765,16767,16769-16774,16776,16778-16783,16785-16788,16790,16792,16794,16796-16802,16804-16807,16809,16811-16817,16819,16821-16825,16827-16831,16833,16835-16836,16838,16840-16844,16846-16847,16849,16851,16853-16854,16856-16859,16861,16863-16865,16867,16869-16871,16873,16875-16876,16878,16880-16881,16883,16885,16887-16888,16890,16892,16894-16900,16902,16904,16906,16908-16909,16911-16916,16918-16919,16921,16923,16925,16927,16929-16930,16932,16934,16936-16937,16939-16942,16944,16946,16948,16950,16952-16953,16955-16959,16961,16963,16965-16970,16972,16974-16977,16979-16982,16984,16986,16988-16999,17001,17003,17005-17018
\ No newline at end of property
+/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,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619,15621-15630,15632-15635,15637-15639,15641-15643,15645,15647-15665,15667-15668,15670-15671,15673-15693,15695-15712,15714-15764,15766-15767,15769-15787,15789-15802,15804-15811,15813-15814,15816-15818,15820-15849,15851-15887,15889-15900,15902-16046,16048-16051,16053,16055,16057-16063,16065-16071,16073-16077,16079-16081,16083-16099,16101-16130,16132-16140,16142,16144-16212,16214-16219,16221,16223-16224,16226,16228-16229,16231,16233,16235,16237,16239-16240,16242,16244-16246,16248,16250-16251,16253-16255,16257-16259,16261,16263,16265,16267,16269-16276,16278,16280-16283,16285,16287-16288,16290,16292-16295,16297-16305,16307-16314,16316-16318,16320-16322,16324,16326-16330,16332,16334,16336,16338-16339,16341-16342,16344,16346,16348,16350,16352-16353,16355-16358,16360,16362,16364-16369,16371,16373,16375-16378,16380,16382-16383,16385,16387,16389,16391,16393-16395,16397,16399-16402,16404,16406,16408,16410-16415,16417,16419-16420,16422-16425,16427,16429-16440,16442,16444,16446,16448-16449,16451,16453,16455-16463,16465-16472,16474-16475,16477-16484,16486,16488,16490-16497,16499,16501-16503,16505-16512,16514-16517,16519,16521,16523,16525,16527-16532,16534,16536-16541,16543,16545-16554,16556,16558-16565,16567-16575,16577-16584,16586-16588,16590,16592-16593,16595-16596,16598,16600-16601,16603-16608,16610-16614,16616-16618,16620-16621,16623-16624,16626,16628,16630,16632-16638,16640,16642,16644,16646-16651,16653-16663,16665,16667,16669,16671,16673,16675,16677,16679-16680,16682,16684,16686,16688-16692,16694-16695,16697-16699,16701,16703,16705-16706,16708,16710,16712,16714,16716-16718,16720-16728,16730-16732,16734-16739,16741,16743-16746,16748-16750,16752-16755,16757,16759-16761,16763,16765,16767,16769-16774,16776,16778-16783,16785-16788,16790,16792,16794,16796-16802,16804-16807,16809,16811-16817,16819,16821-16825,16827-16831,16833,16835-16836,16838,16840-16844,16846-16847,16849,16851,16853-16854,16856-16859,16861,16863-16865,16867,16869-16871,16873,16875-16876,16878,16880-16881,16883,16885,16887-16888,16890,16892,16894-16900,16902,16904,16906,16908-16909,16911-16916,16918-16919,16921,16923,16925,16927,16929-16930,16932,16934,16936-16937,16939-16942,16944,16946,16948,16950,16952-16953,16955-16959,16961,16963,16965-16970,16972,16974-16977,16979-16982,16984,16986,16988-16999,17001,17003,17005-17018,17020-17023
\ No newline at end of property
Index: branches/Version-2_0-branch/booking
===================================================================
--- branches/Version-2_0-branch/booking 2017-09-01 12:28:15 UTC (rev 17023)
+++ branches/Version-2_0-branch/booking 2017-09-01 13:04:02 UTC (rev 17024)
Property changes on: branches/Version-2_0-branch/booking
___________________________________________________________________
Modified: svn:mergeinfo
## -1,3 +1,3 ##
/branches/dev-syncromind-2/booking:14933-16846
/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,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15360-15541,15543-15566,15568-15569,15585-15617,15621-15630,15637-15639,15641-15643,15645,15647-15665,15667-15668,15695-15712,15714-15764,15820-15849,15889-15900,15902-16046,16055,16101-16130,16144-16212,16297-16305,16307-16314,16393-16395,16490-16497,16514-16517,16534,16567-16575,16577-16584,16586-16588,16590,16592-16593,16595-16596,16598,16616-16618,16730,16734-16739,16748-16750,16769-16774,16785-16788,16796-16802,16835-16836,16846-16847,16883,16885,16908-16909,16939-16942,16944,16946,16948
\ No newline at end of property
+/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,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15360-15541,15543-15566,15568-15569,15585-15617,15621-15630,15637-15639,15641-15643,15645,15647-15665,15667-15668,15695-15712,15714-15764,15820-15849,15889-15900,15902-16046,16055,16101-16130,16144-16212,16297-16305,16307-16314,16393-16395,16490-16497,16514-16517,16534,16567-16575,16577-16584,16586-16588,16590,16592-16593,16595-16596,16598,16616-16618,16730,16734-16739,16748-16750,16769-16774,16785-16788,16796-16802,16835-16836,16846-16847,16883,16885,16908-16909,16939-16942,16944,16946,16948,17020-17023
\ No newline at end of property
Modified:
branches/Version-2_0-branch/booking/inc/class.boaccount_code_set.inc.php
===================================================================
--- branches/Version-2_0-branch/booking/inc/class.boaccount_code_set.inc.php
2017-09-01 12:28:15 UTC (rev 17023)
+++ branches/Version-2_0-branch/booking/inc/class.boaccount_code_set.inc.php
2017-09-01 13:04:02 UTC (rev 17024)
@@ -10,7 +10,7 @@
$this->so = CreateObject('booking.soaccount_code_set');
}
- protected function get_object_role_permissions( array
$forObject, $defaultPermissions )
+ protected function get_object_role_permissions( $forObject,
$defaultPermissions )
{
return array_merge(
array
Modified: branches/Version-2_0-branch/booking/inc/class.boallocation.inc.php
===================================================================
--- branches/Version-2_0-branch/booking/inc/class.boallocation.inc.php
2017-09-01 12:28:15 UTC (rev 17023)
+++ branches/Version-2_0-branch/booking/inc/class.boallocation.inc.php
2017-09-01 13:04:02 UTC (rev 17024)
@@ -200,7 +200,7 @@
/**
* @see bocommon_authorized
*/
- protected function get_object_role_permissions( array
$forObject, $defaultPermissions )
+ protected function get_object_role_permissions( $forObject,
$defaultPermissions )
{
return array_merge(
array
Modified: branches/Version-2_0-branch/booking/inc/class.bobooking.inc.php
===================================================================
--- branches/Version-2_0-branch/booking/inc/class.bobooking.inc.php
2017-09-01 12:28:15 UTC (rev 17023)
+++ branches/Version-2_0-branch/booking/inc/class.bobooking.inc.php
2017-09-01 13:04:02 UTC (rev 17024)
@@ -340,7 +340,7 @@
/**
* @see bocommon_authorized
*/
- protected function get_object_role_permissions( array
$forObject, $defaultPermissions )
+ protected function get_object_role_permissions( $forObject,
$defaultPermissions )
{
if ($this->current_app() == 'bookingfrontend')
{
Modified: branches/Version-2_0-branch/booking/inc/class.bobuilding.inc.php
===================================================================
--- branches/Version-2_0-branch/booking/inc/class.bobuilding.inc.php
2017-09-01 12:28:15 UTC (rev 17023)
+++ branches/Version-2_0-branch/booking/inc/class.bobuilding.inc.php
2017-09-01 13:04:02 UTC (rev 17024)
@@ -10,7 +10,7 @@
$this->so = CreateObject('booking.sobuilding');
}
- protected function get_object_role_permissions( array
$forObject, $defaultPermissions )
+ protected function get_object_role_permissions( $forObject,
$defaultPermissions )
{
return array_merge(
array
Modified:
branches/Version-2_0-branch/booking/inc/class.bocommon_authorized.inc.php
===================================================================
--- branches/Version-2_0-branch/booking/inc/class.bocommon_authorized.inc.php
2017-09-01 12:28:15 UTC (rev 17023)
+++ branches/Version-2_0-branch/booking/inc/class.bocommon_authorized.inc.php
2017-09-01 13:04:02 UTC (rev 17024)
@@ -226,7 +226,7 @@
return is_null($for_object) ?
$this->collection_role_permissions() :
$this->object_role_permissions($for_object);
}
- public function object_role_permissions( array $forObject )
+ public function object_role_permissions( $forObject )
{
return $this->get_object_role_permissions($forObject,
$this->defaultObjectPermissions);
}
@@ -264,7 +264,7 @@
// return true;
// }
- protected abstract function get_object_role_permissions( array
$forObject, $defaultPermissions );
+ protected abstract function get_object_role_permissions(
$forObject, $defaultPermissions );
protected abstract function get_collection_role_permissions(
$defaultPermissions );
Modified:
branches/Version-2_0-branch/booking/inc/class.bocommon_global_manager_authorized.inc.php
===================================================================
---
branches/Version-2_0-branch/booking/inc/class.bocommon_global_manager_authorized.inc.php
2017-09-01 12:28:15 UTC (rev 17023)
+++
branches/Version-2_0-branch/booking/inc/class.bocommon_global_manager_authorized.inc.php
2017-09-01 13:04:02 UTC (rev 17024)
@@ -7,7 +7,7 @@
/**
* @see bocommon_authorized
*/
- protected function get_object_role_permissions( array
$forObject, $defaultPermissions )
+ protected function get_object_role_permissions( $forObject,
$defaultPermissions )
{
return array_merge(
array
Modified: branches/Version-2_0-branch/booking/inc/class.bodocument.inc.php
===================================================================
--- branches/Version-2_0-branch/booking/inc/class.bodocument.inc.php
2017-09-01 12:28:15 UTC (rev 17023)
+++ branches/Version-2_0-branch/booking/inc/class.bodocument.inc.php
2017-09-01 13:04:02 UTC (rev 17024)
@@ -43,7 +43,7 @@
/**
* @see bocommon_authorized
*/
- protected function get_object_role_permissions( array
$forObject, $defaultPermissions )
+ protected function get_object_role_permissions( $forObject,
$defaultPermissions )
{
return array_merge(
array
Modified:
branches/Version-2_0-branch/booking/inc/class.bodocument_resource.inc.php
===================================================================
--- branches/Version-2_0-branch/booking/inc/class.bodocument_resource.inc.php
2017-09-01 12:28:15 UTC (rev 17023)
+++ branches/Version-2_0-branch/booking/inc/class.bodocument_resource.inc.php
2017-09-01 13:04:02 UTC (rev 17024)
@@ -4,7 +4,7 @@
class booking_bodocument_resource extends booking_bodocument
{
- protected function get_object_role_permissions( array
$forObject, $defaultPermissions )
+ protected function get_object_role_permissions( $forObject,
$defaultPermissions )
{
$role_permissions =
parent::get_object_role_permissions($forObject, $defaultPermissions);
$role_permissions['parent_role_permissions']['owner']['parent_role_permissions']['building']
= array
Modified: branches/Version-2_0-branch/booking/inc/class.boevent.inc.php
===================================================================
--- branches/Version-2_0-branch/booking/inc/class.boevent.inc.php
2017-09-01 12:28:15 UTC (rev 17023)
+++ branches/Version-2_0-branch/booking/inc/class.boevent.inc.php
2017-09-01 13:04:02 UTC (rev 17024)
@@ -41,7 +41,7 @@
/**
* @see bocommon_authorized
*/
- protected function get_object_role_permissions( array
$forObject, $defaultPermissions )
+ protected function get_object_role_permissions( $forObject,
$defaultPermissions )
{
if ($this->current_app() == 'booking')
{
Modified: branches/Version-2_0-branch/booking/inc/class.bogroup.inc.php
===================================================================
--- branches/Version-2_0-branch/booking/inc/class.bogroup.inc.php
2017-09-01 12:28:15 UTC (rev 17023)
+++ branches/Version-2_0-branch/booking/inc/class.bogroup.inc.php
2017-09-01 13:04:02 UTC (rev 17024)
@@ -40,7 +40,7 @@
/**
* @see bocommon_authorized
*/
- protected function get_object_role_permissions( array
$forObject, $defaultPermissions )
+ protected function get_object_role_permissions( $forObject,
$defaultPermissions )
{
if ($this->current_app() == 'booking')
{
Modified: branches/Version-2_0-branch/booking/inc/class.boorganization.inc.php
===================================================================
--- branches/Version-2_0-branch/booking/inc/class.boorganization.inc.php
2017-09-01 12:28:15 UTC (rev 17023)
+++ branches/Version-2_0-branch/booking/inc/class.boorganization.inc.php
2017-09-01 13:04:02 UTC (rev 17024)
@@ -40,7 +40,7 @@
/**
* @see bocommon_authorized
*/
- protected function get_object_role_permissions( array
$forObject, $defaultPermissions )
+ protected function get_object_role_permissions( $forObject,
$defaultPermissions )
{
if ($this->current_app() == 'booking')
{
Modified: branches/Version-2_0-branch/booking/inc/class.bopermission.inc.php
===================================================================
--- branches/Version-2_0-branch/booking/inc/class.bopermission.inc.php
2017-09-01 12:28:15 UTC (rev 17023)
+++ branches/Version-2_0-branch/booking/inc/class.bopermission.inc.php
2017-09-01 13:04:02 UTC (rev 17024)
@@ -44,7 +44,7 @@
/**
* @see bocommon_authorized
*/
- protected function get_object_role_permissions( array
$forObject, $defaultPermissions )
+ protected function get_object_role_permissions( $forObject,
$defaultPermissions )
{
return array_merge(
array
Modified:
branches/Version-2_0-branch/booking/inc/class.bopermission_resource.inc.php
===================================================================
--- branches/Version-2_0-branch/booking/inc/class.bopermission_resource.inc.php
2017-09-01 12:28:15 UTC (rev 17023)
+++ branches/Version-2_0-branch/booking/inc/class.bopermission_resource.inc.php
2017-09-01 13:04:02 UTC (rev 17024)
@@ -4,7 +4,7 @@
class booking_bopermission_resource extends booking_bopermission
{
- protected function get_object_role_permissions( array
$forObject, $defaultPermissions )
+ protected function get_object_role_permissions( $forObject,
$defaultPermissions )
{
$role_permissions =
parent::get_object_role_permissions($forObject, $defaultPermissions);
$role_permissions['parent_role_permissions']['object']['parent_role_permissions']['building']
= array
Modified:
branches/Version-2_0-branch/booking/inc/class.bopermission_season.inc.php
===================================================================
--- branches/Version-2_0-branch/booking/inc/class.bopermission_season.inc.php
2017-09-01 12:28:15 UTC (rev 17023)
+++ branches/Version-2_0-branch/booking/inc/class.bopermission_season.inc.php
2017-09-01 13:04:02 UTC (rev 17024)
@@ -4,7 +4,7 @@
class booking_bopermission_season extends booking_bopermission
{
- protected function get_object_role_permissions( array
$forObject, $defaultPermissions )
+ protected function get_object_role_permissions( $forObject,
$defaultPermissions )
{
$role_permissions =
parent::get_object_role_permissions($forObject, $defaultPermissions);
$role_permissions['parent_role_permissions']['object']['parent_role_permissions']['building']
= array
Modified: branches/Version-2_0-branch/booking/inc/class.boresource.inc.php
===================================================================
--- branches/Version-2_0-branch/booking/inc/class.boresource.inc.php
2017-09-01 12:28:15 UTC (rev 17023)
+++ branches/Version-2_0-branch/booking/inc/class.boresource.inc.php
2017-09-01 13:04:02 UTC (rev 17024)
@@ -51,7 +51,7 @@
/**
* @see bocommon_authorized
*/
- protected function get_object_role_permissions( array
$forObject, $defaultPermissions )
+ protected function get_object_role_permissions( $forObject,
$defaultPermissions )
{
return array_merge(
array
Modified: branches/Version-2_0-branch/booking/inc/class.boseason.inc.php
===================================================================
--- branches/Version-2_0-branch/booking/inc/class.boseason.inc.php
2017-09-01 12:28:15 UTC (rev 17023)
+++ branches/Version-2_0-branch/booking/inc/class.boseason.inc.php
2017-09-01 13:04:02 UTC (rev 17024)
@@ -42,7 +42,7 @@
return $parent_roles;
}
- protected function get_object_role_permissions( array
$forObject, $defaultPermissions )
+ protected function get_object_role_permissions( $forObject,
$defaultPermissions )
{
return array_merge(
array
Modified: branches/Version-2_0-branch/booking/inc/class.soallocation.inc.php
===================================================================
--- branches/Version-2_0-branch/booking/inc/class.soallocation.inc.php
2017-09-01 12:28:15 UTC (rev 17023)
+++ branches/Version-2_0-branch/booking/inc/class.soallocation.inc.php
2017-09-01 13:04:02 UTC (rev 17024)
@@ -254,10 +254,15 @@
$from = "'" . $allocation['from_'] . "'";
$to = "'" . $allocation['to_'] . "'";
- $org_id = $allocation['organization_id'];
+ $org_id = (int)$allocation['organization_id'];
$season_id = $allocation['season_id'];
$resources = implode(",", $allocation['resources']);
+ if(empty($allocation['resources']))
+ {
+ return false;
+ }
+
$sql = "SELECT id FROM bb_allocation ba2 JOIN
bb_allocation_resource bar2 ON (ba2.id = bar2.allocation_id) WHERE ba2.from_ =
($from) AND ba2.to_ = ($to) AND ba2.organization_id = ($org_id) AND
ba2.season_id = ($season_id) AND bar2.resource_id IN ($resources)";
$this->db->limit_query($sql, 0, __LINE__, __FILE__, 1);
Modified: branches/Version-2_0-branch/booking/inc/class.sobooking.inc.php
===================================================================
--- branches/Version-2_0-branch/booking/inc/class.sobooking.inc.php
2017-09-01 12:28:15 UTC (rev 17023)
+++ branches/Version-2_0-branch/booking/inc/class.sobooking.inc.php
2017-09-01 13:04:02 UTC (rev 17024)
@@ -392,10 +392,15 @@
{
$from = "'" . $booking['from_'] . "'";
$to = "'" . $booking['to_'] . "'";
- $gid = $booking['group_id'];
- $season_id = $booking['season_id'];
+ $gid = (int)$booking['group_id'];
+ $season_id = (int)$booking['season_id'];
$resources = implode(",", $booking['resources']);
+ if(empty($booking['resources']))
+ {
+ return false;
+ }
+
$sql = "SELECT bb.id,bbr.resource_id FROM bb_booking
bb,bb_booking_resource bbr WHERE bb.from_ = ($from) AND bb.to_ = ($to) AND
bb.group_id = ($gid) AND bb.season_id = ($season_id) AND bb.id = bbr.booking_id
AND EXISTS (SELECT 1 FROM bb_booking_resource bbr2 WHERE bbr2.resource_id IN
($resources) AND bbr2.resource_id = bbr.resource_id)";
$this->db->limit_query($sql, 0, __LINE__, __FILE__, 1);
@@ -476,10 +481,15 @@
$from = "'" . $booking['from_'] . "'";
$to = "'" . $booking['to_'] . "'";
- $org_id = $booking['organization_id'];
- $season_id = $booking['season_id'];
+ $org_id = (int)$booking['organization_id'];
+ $season_id = (int)$booking['season_id'];
$resources = implode(",", $booking['resources']);
+ if(empty($booking['resources']))
+ {
+ return True;
+ }
+
$sql = "SELECT id FROM bb_allocation ba2 WHERE
ba2.from_ = ($from) AND ba2.to_ = ($to) AND ba2.organization_id = ($org_id) AND
ba2.season_id = ($season_id) AND EXISTS ( SELECT 1 FROM bb_allocation
a,bb_allocation_resource b WHERE a.id = b.allocation_id AND b.resource_id IN
($resources))";
$this->db->limit_query($sql, 0, __LINE__, __FILE__, 1);
if (!$this->db->next_record())
Modified:
branches/Version-2_0-branch/booking/inc/class.sopermission_permission_document_building.inc.php
===================================================================
---
branches/Version-2_0-branch/booking/inc/class.sopermission_permission_document_building.inc.php
2017-09-01 12:28:15 UTC (rev 17023)
+++
branches/Version-2_0-branch/booking/inc/class.sopermission_permission_document_building.inc.php
2017-09-01 13:04:02 UTC (rev 17024)
@@ -4,7 +4,7 @@
class booking_sopermission_permission_document_building extends
booking_sopermission_permission
{
- protected function get_object_role_permissions( array
$forObject, $defaultPermissions )
+ protected function get_object_role_permissions( $forObject,
$defaultPermissions )
{
$role_permissions =
parent::get_object_role_permissions($forObject, $defaultPermissions);
$role_permissions['parent_role_permissions']['object']['parent_role_permissions']['building']
= array
Modified:
branches/Version-2_0-branch/booking/inc/class.uicompleted_reservation_export.inc.php
===================================================================
---
branches/Version-2_0-branch/booking/inc/class.uicompleted_reservation_export.inc.php
2017-09-01 12:28:15 UTC (rev 17023)
+++
branches/Version-2_0-branch/booking/inc/class.uicompleted_reservation_export.inc.php
2017-09-01 13:04:02 UTC (rev 17024)
@@ -269,7 +269,7 @@
if ($filter_to)
{
- $filter_to2 = split("/", $filter_to);
+ $filter_to2 = explode("/", $filter_to);
$filter_to = $filter_to2[1] . "/" .
$filter_to2[0] . "/" . $filter_to2[2];
$filters['where'][] = "%%table%%" .
sprintf(".to_ <= '%s 23:59:59'",
$GLOBALS['phpgw']->db->db_addslashes($filter_to));
}
Modified: branches/Version-2_0-branch/booking/templates/base/event_new.xsl
===================================================================
--- branches/Version-2_0-branch/booking/templates/base/event_new.xsl
2017-09-01 12:28:15 UTC (rev 17023)
+++ branches/Version-2_0-branch/booking/templates/base/event_new.xsl
2017-09-01 13:04:02 UTC (rev 17024)
@@ -24,17 +24,17 @@
<xsl:value-of select="php:function('lang', 'Activity')" />
</label>
<select
name="activity_id" id="field_activity" class="pure-u-1 pure-u-sm-1-2
pure-u-lg-1-3">
+
<xsl:attribute name="data-validation">
+
<xsl:text>required</xsl:text>
+
</xsl:attribute>
+
<xsl:attribute name="data-validation-error-msg">
+
<xsl:value-of select="php:function('lang', 'Please select an activity')" />
+
</xsl:attribute>
<option
value="">
<xsl:value-of select="php:function('lang', '-- select an activity --')" />
</option>
<xsl:for-each select="activities">
<option>
-
<xsl:attribute name="data-validation">
-
<xsl:text>required</xsl:text>
-
</xsl:attribute>
-
<xsl:attribute name="data-validation-error-msg">
-
<xsl:value-of select="php:function('lang', 'Please select an
activity')" />
-
</xsl:attribute>
<xsl:if test="../event/activity_id = id">
<xsl:attribute name="selected">selected</xsl:attribute>
</xsl:if>
Modified: branches/Version-2_0-branch/booking/templates/base/group_edit.xsl
===================================================================
--- branches/Version-2_0-branch/booking/templates/base/group_edit.xsl
2017-09-01 12:28:15 UTC (rev 17023)
+++ branches/Version-2_0-branch/booking/templates/base/group_edit.xsl
2017-09-01 13:04:02 UTC (rev 17024)
@@ -60,6 +60,12 @@
<xsl:value-of
select="php:function('lang', 'Activity')" />
</label>
<select name="activity_id"
id="field_activity">
+ <xsl:attribute
name="data-validation">
+
<xsl:text>required</xsl:text>
+ </xsl:attribute>
+ <xsl:attribute
name="data-validation-error-msg">
+ <xsl:value-of
select="php:function('lang', 'Please select an activity')" />
+ </xsl:attribute>
<option value="">
<xsl:value-of
select="php:function('lang', '-- select an activity --')" />
</option>
Modified:
branches/Version-2_0-branch/controller/inc/class.uicontrol_item.inc.php
===================================================================
--- branches/Version-2_0-branch/controller/inc/class.uicontrol_item.inc.php
2017-09-01 12:28:15 UTC (rev 17023)
+++ branches/Version-2_0-branch/controller/inc/class.uicontrol_item.inc.php
2017-09-01 13:04:02 UTC (rev 17024)
@@ -422,7 +422,7 @@
$search_for = $params['query'];
$start_index = $params['start'];
- $num_of_objects = $params['results'] > 0 ?
$params['results'] : null;
+ $num_of_objects = $params['results'] > 0 ?
$params['results'] : 0;
$sort_field = $params['order'];
$search_type = '';
Modified: branches/Version-2_0-branch/eventplanner/inc/class.bocalendar.inc.php
===================================================================
--- branches/Version-2_0-branch/eventplanner/inc/class.bocalendar.inc.php
2017-09-01 12:28:15 UTC (rev 17023)
+++ branches/Version-2_0-branch/eventplanner/inc/class.bocalendar.inc.php
2017-09-01 13:04:02 UTC (rev 17024)
@@ -174,20 +174,26 @@
$_ids = $ids;
}
+ if($action == 'disconnect' && $_ids)
+ {
+ $mail_info =
$this->create_disconnect_email($_ids);
+ }
+
$ret =
eventplanner_socalendar::get_instance()->update_active_status($_ids, $action);
if($ret && $action == 'disconnect')
{
- $this->send_disconnect_email($_ids);
+ $this->send_disconnect_email($mail_info);
}
return $ret;
}
- function send_disconnect_email($ids)
+ function create_disconnect_email($ids)
{
$config = CreateObject('phpgwapi.config',
'eventplanner')->read();
$sobooking = createObject('eventplanner.sobooking');
+ $mail_info = array();
foreach ($ids as $calendar_id)
{
$booking_id =
$sobooking->get_booking_id_from_calendar( $calendar_id );
@@ -217,8 +223,6 @@
$subject = !empty($config['canceled_subject'])
? $config['canceled_subject'] : $event_title;
$event_title = $application->title;
- $send = CreateObject('phpgwapi.send');
-
$lang_when = lang('when');
$lang_where = lang('where');
@@ -373,9 +377,31 @@
$from_email =
!empty($config['receipt_blind_copy']) ? $config['receipt_blind_copy'] :
$customer_contact_email;
$from_name =
!empty($config['receipt_blind_copy']) ? $config['receipt_blind_copy'] :
$customer_contact_name;
+ $mail_info[] = array(
+ 'to_email' => $to_email,
+ 'subject' => $subject,
+ 'content' => stripslashes($content),
+ 'cc' => $cc,
+ 'bcc' => $bcc,
+ 'from_email' => $from_email,
+ 'from_name' => $from_name,
+ );
+
+
+ }
+
+ return $mail_info;
+ }
+
+
+ private function send_disconnect_email($mail_info)
+ {
+ $send = CreateObject('phpgwapi.send');
+ foreach ($mail_info as $entry)
+ {
try
{
- $rcpt = $send->msg('email', $to_email,
$subject, stripslashes($content), '', $cc, $bcc, $from_email, $from_name,
'html');
+ $rcpt = $send->msg('email',
$entry['to_email'], $entry['subject'], $entry['content'], '', $entry['cc'],
$entry['bcc'], $entry['from_email'], $entry['from_name'], 'html');
}
catch (phpmailerException $e)
{
@@ -383,7 +409,6 @@
}
phpgwapi_cache::message_set("Email: $to_email,
$cc", 'message');
-
}
}
Modified: branches/Version-2_0-branch/eventplanner/inc/class.sobooking.inc.php
===================================================================
--- branches/Version-2_0-branch/eventplanner/inc/class.sobooking.inc.php
2017-09-01 12:28:15 UTC (rev 17023)
+++ branches/Version-2_0-branch/eventplanner/inc/class.sobooking.inc.php
2017-09-01 13:04:02 UTC (rev 17024)
@@ -27,6 +27,7 @@
* @version $Id: $
*/
phpgw::import_class('phpgwapi.socommon');
+ include_class('eventplanner', 'booking', 'inc/model/');
class eventplanner_sobooking extends phpgwapi_socommon
{
Modified: branches/Version-2_0-branch/eventplanner/inc/class.socalendar.inc.php
===================================================================
--- branches/Version-2_0-branch/eventplanner/inc/class.socalendar.inc.php
2017-09-01 12:28:15 UTC (rev 17023)
+++ branches/Version-2_0-branch/eventplanner/inc/class.socalendar.inc.php
2017-09-01 13:04:02 UTC (rev 17024)
@@ -158,6 +158,21 @@
break;
case 'disconnect':
+ $sql = "SELECT id AS booking_id FROM
eventplanner_booking WHERE calendar_id IN(". implode(',', $ids) . ')';
+
$this->db->query($sql,__LINE__,__FILE__);
+ $bookings = array();
+ while ($this->db->next_record())
+ {
+ $bookings[] =
$this->db->f('booking_id');
+ }
+
+ $sql = "DELETE FROM
eventplanner_booking_comment WHERE booking_id IN(". implode(',', $bookings) .
')';
+
$this->db->query($sql,__LINE__,__FILE__);
+ $sql = "DELETE FROM
eventplanner_booking_customer_report WHERE booking_id IN(". implode(',',
$bookings) . ')';
+
$this->db->query($sql,__LINE__,__FILE__);
+ $sql = "DELETE FROM
eventplanner_booking_vendor_report WHERE booking_id IN(". implode(',',
$bookings) . ')';
+
$this->db->query($sql,__LINE__,__FILE__);
+
$sql = "DELETE FROM
eventplanner_booking WHERE calendar_id IN(". implode(',', $ids) . ')';
return
$this->db->query($sql,__LINE__,__FILE__);
Modified: branches/Version-2_0-branch/eventplanner/inc/class.uibooking.inc.php
===================================================================
--- branches/Version-2_0-branch/eventplanner/inc/class.uibooking.inc.php
2017-09-01 12:28:15 UTC (rev 17023)
+++ branches/Version-2_0-branch/eventplanner/inc/class.uibooking.inc.php
2017-09-01 13:04:02 UTC (rev 17024)
@@ -248,7 +248,7 @@
$datatable_def[] = array(
'container' => 'datatable-container_1',
'requestUrl' =>
json_encode(self::link(array('menuaction' =>
"{$this->currentapp}.uivendor_report.query",
- 'filter_booking_id' => $id,
+ 'filter_booking_id' => $id ? $id : -1,
'phpgw_return_as' => 'json'))),
'ColumnDefs' => $vendor_report_def,
'data' => json_encode($vendor_report),
@@ -278,7 +278,7 @@
$datatable_def[] = array(
'container' => 'datatable-container_2',
'requestUrl' =>
json_encode(self::link(array('menuaction' =>
"{$this->currentapp}.uicustomer_report.query",
- 'filter_booking_id' => $id,
+ 'filter_booking_id' => $id ? $id : -1,
'phpgw_return_as' => 'json'))),
'ColumnDefs' => $customer_report_def,
'data' => json_encode($customer_report),
Modified: branches/Version-2_0-branch/phpgwapi/js/jquery/jqTree/tree.jquery.js
===================================================================
--- branches/Version-2_0-branch/phpgwapi/js/jquery/jqTree/tree.jquery.js
2017-09-01 12:28:15 UTC (rev 17023)
+++ branches/Version-2_0-branch/phpgwapi/js/jquery/jqTree/tree.jquery.js
2017-09-01 13:04:02 UTC (rev 17024)
@@ -1,5 +1,5 @@
/*!
- * JqTree 1.4.1
+ * JqTree 1.4.2
*
* Copyright 2017 Marco Braak
*
@@ -51,9 +51,6 @@
/******/ // expose the module cache
/******/ __webpack_require__.c = installedModules;
/******/
-/******/ // identity function for calling harmony imports with the
correct context
-/******/ __webpack_require__.i = function(value) { return value; };
-/******/
/******/ // define getter function for harmony exports
/******/ __webpack_require__.d = function(exports, name, getter) {
/******/ if(!__webpack_require__.o(exports, name)) {
@@ -81,7 +78,7 @@
/******/ __webpack_require__.p = "";
/******/
/******/ // Load entry module and return exports
-/******/ return __webpack_require__(__webpack_require__.s = 19);
+/******/ return __webpack_require__(__webpack_require__.s = 14);
/******/ })
/************************************************************************/
/******/ ([
@@ -332,7 +329,8 @@
return nodes.map(function (node) {
var tmp_node = {};
for (var k in node) {
- if (["parent", "children", "element", "tree"].indexOf(k)
=== -1 &&
+ if (["parent", "children", "element", "tree"].indexOf(k)
===
+ -1 &&
Object.prototype.hasOwnProperty.call(node, k)) {
var v = node[k];
tmp_node[k] = v;
@@ -375,7 +373,9 @@
var node = new this.tree.node_class(node_info);
var child_index = this.parent.getChildIndex(this);
this.parent.addChildAtPosition(node, child_index + 1);
- if (typeof node_info === "object" && node_info["children"] &&
node_info["children"].length) {
+ if (typeof node_info === "object" &&
+ node_info["children"] &&
+ node_info["children"].length) {
node.loadFromData(node_info["children"]);
}
return node;
@@ -389,7 +389,9 @@
var node = new this.tree.node_class(node_info);
var child_index = this.parent.getChildIndex(this);
this.parent.addChildAtPosition(node, child_index);
- if (typeof node_info === "object" && node_info["children"] &&
node_info["children"].length) {
+ if (typeof node_info === "object" &&
+ node_info["children"] &&
+ node_info["children"].length) {
node.loadFromData(node_info["children"]);
}
return node;
@@ -421,7 +423,9 @@
Node.prototype.append = function (node_info) {
var node = new this.tree.node_class(node_info);
this.addChild(node);
- if (typeof node_info === "object" && node_info["children"] &&
node_info["children"].length) {
+ if (typeof node_info === "object" &&
+ node_info["children"] &&
+ node_info["children"].length) {
node.loadFromData(node_info["children"]);
}
return node;
@@ -429,7 +433,9 @@
Node.prototype.prepend = function (node_info) {
var node = new this.tree.node_class(node_info);
this.addChildAtPosition(node, 0);
- if (typeof node_info === "object" && node_info["children"] &&
node_info["children"].length) {
+ if (typeof node_info === "object" &&
+ node_info["children"] &&
+ node_info["children"].length) {
node.loadFromData(node_info["children"]);
}
return node;
@@ -545,7 +551,8 @@
else {
var previous_sibling = this.getPreviousSibling();
if (previous_sibling) {
- if (!previous_sibling.hasChildren() ||
!previous_sibling.is_open) {
+ if (!previous_sibling.hasChildren() ||
+ !previous_sibling.is_open) {
// Previous sibling
return previous_sibling;
}
@@ -673,7 +680,7 @@
var getDataKey = function () { return "simple_widget_" + widget_name;
};
function getWidgetData(el, data_key) {
var widget = $.data(el, data_key);
- if (widget && (widget instanceof SimpleWidget)) {
+ if (widget && widget instanceof SimpleWidget) {
return widget;
}
else {
@@ -712,9 +719,10 @@
for (var _i = 0, _a = $el.get(); _i < _a.length; _i++) {
var el = _a[_i];
var widget = $.data(el, getDataKey());
- if (widget && (widget instanceof SimpleWidget)) {
+ if (widget && widget instanceof SimpleWidget) {
var widget_function = widget[function_name];
- if (widget_function && (typeof widget_function ===
"function")) {
+ if (widget_function &&
+ typeof widget_function === "function") {
result = widget_function.apply(widget, args);
}
}
@@ -755,9 +763,9 @@
SimpleWidget.prototype._deinit = function () {
//
};
+ SimpleWidget.defaults = {};
return SimpleWidget;
}());
-SimpleWidget.defaults = {};
exports["default"] = SimpleWidget;
@@ -778,11 +786,11 @@
};
})();
exports.__esModule = true;
-var version_1 = __webpack_require__(12);
-var drag_and_drop_handler_1 = __webpack_require__(4);
-var elements_renderer_1 = __webpack_require__(5);
-var key_handler_1 = __webpack_require__(6);
-var mouse_widget_1 = __webpack_require__(7);
+var version_1 = __webpack_require__(4);
+var drag_and_drop_handler_1 = __webpack_require__(5);
+var elements_renderer_1 = __webpack_require__(6);
+var key_handler_1 = __webpack_require__(7);
+var mouse_widget_1 = __webpack_require__(8);
var save_state_handler_1 = __webpack_require__(9);
var scroll_handler_1 = __webpack_require__(10);
var select_node_handler_1 = __webpack_require__(11);
@@ -789,7 +797,7 @@
var simple_widget_1 = __webpack_require__(2);
var node_1 = __webpack_require__(0);
var util_1 = __webpack_require__(1);
-var node_element_1 = __webpack_require__(8);
+var node_element_1 = __webpack_require__(12);
var JqTreeWidget = (function (_super) {
__extends(JqTreeWidget, _super);
function JqTreeWidget() {
@@ -1135,7 +1143,7 @@
this.mouse_delay = 300;
this.is_initialized = false;
this.options.rtl = this._getRtlOption();
- if (!this.options.closedIcon) {
+ if (this.options.closedIcon === null) {
this.options.closedIcon = this._getDefaultClosedIcon();
}
this.renderer = new elements_renderer_1["default"](this);
@@ -1327,7 +1335,7 @@
}
else {
node.is_open = true;
- return (level !== max_level);
+ return level !== max_level;
}
});
return must_load_on_demand;
@@ -1378,7 +1386,7 @@
}
else {
_this._openNode(node, false, null);
- return (level !== max_level);
+ return level !== max_level;
}
});
if (loading_count === 0) {
@@ -1536,7 +1544,8 @@
}
var canSelect = function () {
if (_this.options.onCanSelectNode) {
- return _this.options.selectable &&
_this.options.onCanSelectNode(node);
+ return (_this.options.selectable &&
+ _this.options.onCanSelectNode(node));
}
else {
return _this.options.selectable;
@@ -1647,10 +1656,14 @@
on_finished();
}
};
- var getDataFromResponse = function (response) { return
($.isArray(response) || typeof response === "object"
- ? response
- : response != null ? $.parseJSON(response) : []); };
- var filterData = function (data) { return (_this.options.dataFilter ?
_this.options.dataFilter(data) : data); };
+ var getDataFromResponse = function (response) {
+ return $.isArray(response) || typeof response === "object"
+ ? response
+ : response != null ? $.parseJSON(response) : [];
+ };
+ var filterData = function (data) {
+ return _this.options.dataFilter ? _this.options.dataFilter(data) :
data;
+ };
var handleSuccess = function (response) {
var data = filterData(getDataFromResponse(response));
handeLoadData(data);
@@ -1664,7 +1677,9 @@
var loadDataFromUrlInfo = function () {
var _url_info = parseUrlInfo();
$.ajax($.extend({}, _url_info, {
- method: url_info.method != null ?
url_info.method.toUpperCase() : "GET",
+ method: url_info.method != null
+ ? url_info.method.toUpperCase()
+ : "GET",
cache: false,
dataType: "json",
success: handleSuccess,
@@ -1697,43 +1712,44 @@
_this._openNode(node, slide, on_finished);
});
};
+ JqTreeWidget.defaults = {
+ autoOpen: false,
+ saveState: false,
+ dragAndDrop: false,
+ selectable: true,
+ useContextMenu: true,
+ onCanSelectNode: null,
+ onSetStateFromStorage: null,
+ onGetStateFromStorage: null,
+ onCreateLi: null,
+ onIsMoveHandle: null,
+ // Can this node be moved?
+ onCanMove: null,
+ // Can this node be moved to this position? function(moved_node,
target_node, position)
+ onCanMoveTo: null,
+ onLoadFailed: null,
+ autoEscape: true,
+ dataUrl: null,
+ // The symbol to use for a closed node - ► BLACK RIGHT-POINTING POINTER
+ // http://www.fileformat.info/info/unicode/char/25ba/index.htm
+ closedIcon: null,
+ // The symbol to use for an open node - ▼ BLACK DOWN-POINTING TRIANGLE
+ // http://www.fileformat.info/info/unicode/char/25bc/index.htm
+ openedIcon: "▼",
+ slide: true,
+ nodeClass: node_1.Node,
+ dataFilter: null,
+ keyboardSupport: true,
+ openFolderDelay: 500,
+ rtl: false,
+ onDragMove: null,
+ onDragStop: null,
+ buttonLeft: true,
+ onLoading: null,
+ tabIndex: 0
+ };
return JqTreeWidget;
}(mouse_widget_1["default"]));
-JqTreeWidget.defaults = {
- autoOpen: false,
- saveState: false,
- dragAndDrop: false,
- selectable: true,
- useContextMenu: true,
- onCanSelectNode: null,
- onSetStateFromStorage: null,
- onGetStateFromStorage: null,
- onCreateLi: null,
- onIsMoveHandle: null,
- // Can this node be moved?
- onCanMove: null,
- // Can this node be moved to this position? function(moved_node,
target_node, position)
- onCanMoveTo: null,
- onLoadFailed: null,
- autoEscape: true,
- dataUrl: null,
- // The symbol to use for a closed node - ► BLACK RIGHT-POINTING POINTER
- // http://www.fileformat.info/info/unicode/char/25ba/index.htm
- closedIcon: null,
- // The symbol to use for an open node - ▼ BLACK DOWN-POINTING TRIANGLE
- // http://www.fileformat.info/info/unicode/char/25bc/index.htm
- openedIcon: "▼",
- slide: true,
- nodeClass: node_1.Node,
- dataFilter: null,
- keyboardSupport: true,
- openFolderDelay: 500,
- rtl: false,
- onDragMove: null,
- onDragStop: null,
- buttonLeft: true,
- onLoading: null
-};
simple_widget_1["default"].register(JqTreeWidget, "tree");
@@ -1743,6 +1759,17 @@
"use strict";
+exports.__esModule = true;
+var version = "1.4.2";
+exports["default"] = version;
+
+
+/***/ }),
+/* 5 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
var __extends = (this && this.__extends) || (function () {
var extendStatics = Object.setPrototypeOf ||
({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ =
b; }) ||
@@ -1770,7 +1797,8 @@
if (!this.mustCaptureElement($element)) {
return null;
}
- if (this.tree_widget.options.onIsMoveHandle &&
!this.tree_widget.options.onIsMoveHandle($element)) {
+ if (this.tree_widget.options.onIsMoveHandle &&
+ !this.tree_widget.options.onIsMoveHandle($element)) {
return null;
}
var node_element = this.tree_widget._getNodeElement($element);
@@ -1780,7 +1808,7 @@
}
}
this.current_item = node_element;
- return (this.current_item != null);
+ return this.current_item != null;
};
DragAndDropHandler.prototype.generateHitAreas = function () {
if (!this.current_item) {
@@ -1799,7 +1827,9 @@
this.refresh();
var offset = $(position_info.target).offset();
var node = this.current_item.node;
- var node_name = this.tree_widget.options.autoEscape ?
util_1.html_escape(node.name) : node.name;
+ var node_name = this.tree_widget.options.autoEscape
+ ? util_1.html_escape(node.name)
+ : node.name;
this.drag_element = new DragElement(node_name,
position_info.page_x - offset.left, position_info.page_y - offset.top,
this.tree_widget.element);
this.is_dragging = true;
this.current_item.$element.addClass("jqtree-moving");
@@ -2018,7 +2048,7 @@
var _this = this;
var is_first_node = true;
var _iterateNode = function (node, next_node) {
- var must_iterate_inside = ((node.is_open || !node.element) &&
node.hasChildren());
+ var must_iterate_inside = (node.is_open || !node.element) &&
node.hasChildren();
var $element = null;
if (node.element) {
$element = $(node.element);
@@ -2044,7 +2074,7 @@
if (must_iterate_inside) {
var children_length_1 = node.children.length;
node.children.forEach(function (_, i) {
- if (i === (children_length_1 - 1)) {
+ if (i === children_length_1 - 1) {
_iterateNode(node.children[i], null);
}
else {
@@ -2125,8 +2155,7 @@
}
};
HitAreasGenerator.prototype.handleAfterOpenFolder = function (node,
next_node) {
- if (node === this.current_node ||
- next_node === this.current_node) {
+ if (node === this.current_node || next_node === this.current_node) {
// Cannot move before or after current item
this.addPosition(node, node_1.Position.None, this.last_top);
}
@@ -2143,8 +2172,7 @@
else {
this.addPosition(node, node_1.Position.Inside, top);
}
- if (next_node === this.current_node ||
- node === this.current_node) {
+ if (next_node === this.current_node || node === this.current_node) {
// Cannot move before or after current item
this.addPosition(node, node_1.Position.None, top);
}
@@ -2209,7 +2237,7 @@
/***/ }),
-/* 5 */
+/* 6 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -2300,7 +2328,9 @@
ElementsRenderer.prototype.createFolderLi = function (node, level,
is_selected) {
var button_classes = this.getButtonClasses(node);
var folder_classes = this.getFolderClasses(node, is_selected);
- var icon_element = node.is_open ? this.opened_icon_element :
this.closed_icon_element;
+ var icon_element = node.is_open
+ ? this.opened_icon_element
+ : this.closed_icon_element;
// li
var li = document.createElement("li");
li.className = "jqtree_common " + folder_classes;
@@ -2313,7 +2343,7 @@
// button link
var button_link = document.createElement("a");
button_link.className = button_classes;
- button_link.appendChild(icon_element.cloneNode(false));
+ button_link.appendChild(icon_element.cloneNode(true));
button_link.setAttribute("role", "presentation");
button_link.setAttribute("aria-hidden", "true");
if (this.tree_widget.options.buttonLeft) {
@@ -2357,7 +2387,7 @@
title_span.setAttribute("aria-selected",
util_1.getBoolString(is_selected));
title_span.setAttribute("aria-expanded",
util_1.getBoolString(is_open));
if (is_selected) {
- title_span.setAttribute("tabindex", "0");
+ title_span.setAttribute("tabindex",
this.tree_widget.options.tabIndex);
}
title_span.innerHTML = this.escapeIfNecessary(node_name);
return title_span;
@@ -2413,7 +2443,7 @@
/***/ }),
-/* 6 */
+/* 7 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -2510,7 +2540,7 @@
else {
this.tree_widget.selectNode(node);
if (this.tree_widget.scroll_handler &&
-
(!this.tree_widget.scroll_handler.isScrolledIntoView($(node.element).find(".jqtree-element"))))
{
+
!this.tree_widget.scroll_handler.isScrolledIntoView($(node.element).find(".jqtree-element")))
{
this.tree_widget.scrollToNode(node);
}
return false;
@@ -2527,17 +2557,17 @@
active_element.tagName === "SPAN" &&
this.tree_widget._containsElement(active_element));
};
+ KeyHandler.LEFT = 37;
+ KeyHandler.UP = 38;
+ KeyHandler.RIGHT = 39;
+ KeyHandler.DOWN = 40;
return KeyHandler;
}());
-KeyHandler.LEFT = 37;
-KeyHandler.UP = 38;
-KeyHandler.RIGHT = 39;
-KeyHandler.DOWN = 40;
exports["default"] = KeyHandler;
/***/ }),
-/* 7 */
+/* 8 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -2636,7 +2666,8 @@
return true;
}
if (this.mouse_down_info) {
- this.is_mouse_started = this._mouseStart(this.mouse_down_info) !==
false;
+ this.is_mouse_started =
+ this._mouseStart(this.mouse_down_info) !== false;
}
if (this.is_mouse_started) {
this._mouseDrag(position_info);
@@ -2698,210 +2729,6 @@
/***/ }),
-/* 8 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-var __extends = (this && this.__extends) || (function () {
- var extendStatics = Object.setPrototypeOf ||
- ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ =
b; }) ||
- function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] =
b[p]; };
- return function (d, b) {
- extendStatics(d, b);
- function __() { this.constructor = d; }
- d.prototype = b === null ? Object.create(b) : (__.prototype =
b.prototype, new __());
- };
-})();
-exports.__esModule = true;
-var node_1 = __webpack_require__(0);
-var NodeElement = (function () {
- function NodeElement(node, tree_widget) {
- this.init(node, tree_widget);
- }
- NodeElement.prototype.init = function (node, tree_widget) {
- this.node = node;
- this.tree_widget = tree_widget;
- if (!node.element) {
- node.element = this.tree_widget.element.get(0);
- }
- this.$element = $(node.element);
- };
- NodeElement.prototype.addDropHint = function (position) {
- if (position === node_1.Position.Inside) {
- return new BorderDropHint(this.$element);
- }
- else {
- return new GhostDropHint(this.node, this.$element, position);
- }
- };
- NodeElement.prototype.select = function () {
- var $li = this.getLi();
- $li.addClass("jqtree-selected");
- $li.attr("aria-selected", "true");
- var $span = this.getSpan();
- $span.attr("tabindex", 0);
- $span.focus();
- };
- NodeElement.prototype.deselect = function () {
- var $li = this.getLi();
- $li.removeClass("jqtree-selected");
- $li.attr("aria-selected", "false");
- var $span = this.getSpan();
- $span.attr("tabindex", -1);
- $span.blur();
- };
- NodeElement.prototype.getUl = function () {
- return this.$element.children("ul:first");
- };
- NodeElement.prototype.getSpan = function () {
- return
this.$element.children(".jqtree-element").find("span.jqtree-title");
- };
- NodeElement.prototype.getLi = function () {
- return this.$element;
- };
- return NodeElement;
-}());
-exports.NodeElement = NodeElement;
-var FolderElement = (function (_super) {
- __extends(FolderElement, _super);
- function FolderElement() {
- return _super !== null && _super.apply(this, arguments) || this;
- }
- FolderElement.prototype.open = function (on_finished, slide) {
- var _this = this;
- if (slide === void 0) { slide = true; }
- if (!this.node.is_open) {
- this.node.is_open = true;
- var $button = this.getButton();
- $button.removeClass("jqtree-closed");
- $button.html("");
- var button_el = $button.get(0);
- if (button_el) {
- var icon =
this.tree_widget.renderer.opened_icon_element.cloneNode(false);
- button_el.appendChild(icon);
- }
- var doOpen = function () {
- var $li = _this.getLi();
- $li.removeClass("jqtree-closed");
- var $span = _this.getSpan();
- $span.attr("aria-expanded", "true");
- if (on_finished) {
- on_finished(_this.node);
- }
- _this.tree_widget._triggerEvent("tree.open", { node:
_this.node });
- };
- if (slide) {
- this.getUl().slideDown("fast", doOpen);
- }
- else {
- this.getUl().show();
- doOpen();
- }
- }
- };
- FolderElement.prototype.close = function (slide) {
- var _this = this;
- if (slide === void 0) { slide = true; }
- if (this.node.is_open) {
- this.node.is_open = false;
- var $button = this.getButton();
- $button.addClass("jqtree-closed");
- $button.html("");
- var button_el = $button.get(0);
- if (button_el) {
- var icon =
this.tree_widget.renderer.closed_icon_element.cloneNode(false);
- button_el.appendChild(icon);
- }
- var doClose = function () {
- var $li = _this.getLi();
- $li.addClass("jqtree-closed");
- var $span = _this.getSpan();
- $span.attr("aria-expanded", "false");
- _this.tree_widget._triggerEvent("tree.close", { node:
_this.node });
- };
- if (slide) {
- this.getUl().slideUp("fast", doClose);
- }
- else {
- this.getUl().hide();
- doClose();
- }
- }
- };
- FolderElement.prototype.addDropHint = function (position) {
- if (!this.node.is_open && position === node_1.Position.Inside) {
- return new BorderDropHint(this.$element);
- }
- else {
- return new GhostDropHint(this.node, this.$element, position);
- }
- };
- FolderElement.prototype.getButton = function () {
- return
this.$element.children(".jqtree-element").find("a.jqtree-toggler");
- };
- return FolderElement;
-}(NodeElement));
-exports.FolderElement = FolderElement;
-var BorderDropHint = (function () {
- function BorderDropHint($element) {
- var $div = $element.children(".jqtree-element");
- var width = $element.width() - 4;
- this.$hint = $('<span class="jqtree-border"></span>');
- $div.append(this.$hint);
- this.$hint.css({
- width: width,
- height: $div.outerHeight() - 4
- });
- }
- BorderDropHint.prototype.remove = function () {
- this.$hint.remove();
- };
- return BorderDropHint;
-}());
-exports.BorderDropHint = BorderDropHint;
-var GhostDropHint = (function () {
- function GhostDropHint(node, $element, position) {
- this.$element = $element;
- this.node = node;
- this.$ghost = $("<li class=\"jqtree_common jqtree-ghost\"><span
class=\"jqtree_common jqtree-circle\"></span>\n <span
class=\"jqtree_common jqtree-line\"></span></li>");
- if (position === node_1.Position.After) {
- this.moveAfter();
- }
- else if (position === node_1.Position.Before) {
- this.moveBefore();
- }
- else if (position === node_1.Position.Inside) {
- if (node.isFolder() && node.is_open) {
- this.moveInsideOpenFolder();
- }
- else {
- this.moveInside();
- }
- }
- }
- GhostDropHint.prototype.remove = function () {
- this.$ghost.remove();
- };
- GhostDropHint.prototype.moveAfter = function () {
- this.$element.after(this.$ghost);
- };
- GhostDropHint.prototype.moveBefore = function () {
- this.$element.before(this.$ghost);
- };
- GhostDropHint.prototype.moveInsideOpenFolder = function () {
- $(this.node.children[0].element).before(this.$ghost);
- };
- GhostDropHint.prototype.moveInside = function () {
- this.$element.after(this.$ghost);
- this.$ghost.addClass("jqtree-inside");
- };
- return GhostDropHint;
-}());
-exports.GhostDropHint = GhostDropHint;
-
-
-/***/ }),
/* 9 */
/***/ (function(module, exports, __webpack_require__) {
@@ -2936,9 +2763,7 @@
var getOpenNodeIds = function () {
var open_nodes = [];
_this.tree_widget.tree.iterate(function (node) {
- if (node.is_open &&
- node.id &&
- node.hasChildren()) {
+ if (node.is_open && node.id && node.hasChildren()) {
open_nodes.push(node.id);
}
return true;
@@ -2945,7 +2770,9 @@
});
return open_nodes;
};
- var getSelectedNodeIds = function () { return
_this.tree_widget.getSelectedNodes().map(function (n) { return n.id; }); };
+ var getSelectedNodeIds = function () {
+ return _this.tree_widget.getSelectedNodes().map(function (n) {
return n.id; });
+ };
return {
open_nodes: getOpenNodeIds(),
selected_node: getSelectedNodeIds()
@@ -3179,7 +3006,7 @@
element_top = $element.offset().top;
element_bottom = element_top + $element.height();
}
- return ((element_bottom <= view_bottom) && (element_top >= view_top));
+ return element_bottom <= view_bottom && element_top >= view_top;
};
ScrollHandler.prototype._initScrollParent = function () {
var _this = this;
@@ -3189,7 +3016,8 @@
for (var _i = 0, css_attributes_1 = css_attributes; _i <
css_attributes_1.length; _i++) {
var attr = css_attributes_1[_i];
var overflow_value = $el.css(attr);
- if (overflow_value === "auto" || overflow_value ===
"scroll") {
+ if (overflow_value === "auto" ||
+ overflow_value === "scroll") {
return true;
}
}
@@ -3215,7 +3043,9 @@
setDocumentAsScrollParent();
}
var $scroll_parent = getParentWithOverflow();
- if ($scroll_parent && $scroll_parent.length &&
$scroll_parent[0].tagName !== "HTML") {
+ if ($scroll_parent &&
+ $scroll_parent.length &&
+ $scroll_parent[0].tagName !== "HTML") {
this.$scroll_parent = $scroll_parent;
this.scroll_parent_top = this.$scroll_parent.offset().top;
}
@@ -3234,13 +3064,15 @@
return;
}
else {
- var distance_bottom = this.scroll_parent_top +
this.$scroll_parent[0].offsetHeight - area.bottom;
+ var distance_bottom = this.scroll_parent_top +
+ this.$scroll_parent[0].offsetHeight -
+ area.bottom;
if (distance_bottom < 20) {
this.$scroll_parent[0].scrollTop += 20;
this.tree_widget.refreshHitAreas();
this.previous_top = -1;
}
- else if ((area.top - this.scroll_parent_top) < 20) {
+ else if (area.top - this.scroll_parent_top < 20) {
this.$scroll_parent[0].scrollTop -= 20;
this.tree_widget.refreshHitAreas();
this.previous_top = -1;
@@ -3252,7 +3084,8 @@
if (distance_top < 20) {
$(document).scrollTop($(document).scrollTop() - 20);
}
- else if ($(window).height() - (area.bottom - $(document).scrollTop())
< 20) {
+ else if ($(window).height() - (area.bottom - $(document).scrollTop()) <
+ 20) {
$(document).scrollTop($(document).scrollTop() + 20);
}
};
@@ -3348,7 +3181,8 @@
var _this = this;
if (include_children === void 0) { include_children = false; }
if (node.id == null) {
- if (this.selected_single_node && node.element ===
this.selected_single_node.element) {
+ if (this.selected_single_node &&
+ node.element === this.selected_single_node.element) {
this.selected_single_node = null;
}
}
@@ -3381,19 +3215,215 @@
"use strict";
+var __extends = (this && this.__extends) || (function () {
+ var extendStatics = Object.setPrototypeOf ||
+ ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ =
b; }) ||
+ function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] =
b[p]; };
+ return function (d, b) {
+ extendStatics(d, b);
+ function __() { this.constructor = d; }
+ d.prototype = b === null ? Object.create(b) : (__.prototype =
b.prototype, new __());
+ };
+})();
exports.__esModule = true;
-var version = "1.4.1";
-exports["default"] = version;
+var node_1 = __webpack_require__(0);
+var NodeElement = (function () {
+ function NodeElement(node, tree_widget) {
+ this.init(node, tree_widget);
+ }
+ NodeElement.prototype.init = function (node, tree_widget) {
+ this.node = node;
+ this.tree_widget = tree_widget;
+ if (!node.element) {
+ node.element = this.tree_widget.element.get(0);
+ }
+ this.$element = $(node.element);
+ };
+ NodeElement.prototype.addDropHint = function (position) {
+ if (position === node_1.Position.Inside) {
+ return new BorderDropHint(this.$element);
+ }
+ else {
+ return new GhostDropHint(this.node, this.$element, position);
+ }
+ };
+ NodeElement.prototype.select = function () {
+ var $li = this.getLi();
+ $li.addClass("jqtree-selected");
+ $li.attr("aria-selected", "true");
+ var $span = this.getSpan();
+ $span.attr("tabindex", this.tree_widget.options.tabIndex);
+ $span.focus();
+ };
+ NodeElement.prototype.deselect = function () {
+ var $li = this.getLi();
+ $li.removeClass("jqtree-selected");
+ $li.attr("aria-selected", "false");
+ var $span = this.getSpan();
+ $span.removeAttr("tabindex");
+ $span.blur();
+ };
+ NodeElement.prototype.getUl = function () {
+ return this.$element.children("ul:first");
+ };
+ NodeElement.prototype.getSpan = function () {
+ return this.$element
+ .children(".jqtree-element")
+ .find("span.jqtree-title");
+ };
+ NodeElement.prototype.getLi = function () {
+ return this.$element;
+ };
+ return NodeElement;
+}());
+exports.NodeElement = NodeElement;
+var FolderElement = (function (_super) {
+ __extends(FolderElement, _super);
+ function FolderElement() {
+ return _super !== null && _super.apply(this, arguments) || this;
+ }
+ FolderElement.prototype.open = function (on_finished, slide) {
+ var _this = this;
+ if (slide === void 0) { slide = true; }
+ if (!this.node.is_open) {
+ this.node.is_open = true;
+ var $button = this.getButton();
+ $button.removeClass("jqtree-closed");
+ $button.html("");
+ var button_el = $button.get(0);
+ if (button_el) {
+ var icon =
this.tree_widget.renderer.opened_icon_element.cloneNode(false);
+ button_el.appendChild(icon);
+ }
+ var doOpen = function () {
+ var $li = _this.getLi();
+ $li.removeClass("jqtree-closed");
+ var $span = _this.getSpan();
+ $span.attr("aria-expanded", "true");
+ if (on_finished) {
+ on_finished(_this.node);
+ }
+ _this.tree_widget._triggerEvent("tree.open", {
+ node: _this.node
+ });
+ };
+ if (slide) {
+ this.getUl().slideDown("fast", doOpen);
+ }
+ else {
+ this.getUl().show();
+ doOpen();
+ }
+ }
+ };
+ FolderElement.prototype.close = function (slide) {
+ var _this = this;
+ if (slide === void 0) { slide = true; }
+ if (this.node.is_open) {
+ this.node.is_open = false;
+ var $button = this.getButton();
+ $button.addClass("jqtree-closed");
+ $button.html("");
+ var button_el = $button.get(0);
+ if (button_el) {
+ var icon =
this.tree_widget.renderer.closed_icon_element.cloneNode(false);
+ button_el.appendChild(icon);
+ }
+ var doClose = function () {
+ var $li = _this.getLi();
+ $li.addClass("jqtree-closed");
+ var $span = _this.getSpan();
+ $span.attr("aria-expanded", "false");
+ _this.tree_widget._triggerEvent("tree.close", {
+ node: _this.node
+ });
+ };
+ if (slide) {
+ this.getUl().slideUp("fast", doClose);
+ }
+ else {
+ this.getUl().hide();
+ doClose();
+ }
+ }
+ };
+ FolderElement.prototype.addDropHint = function (position) {
+ if (!this.node.is_open && position === node_1.Position.Inside) {
+ return new BorderDropHint(this.$element);
+ }
+ else {
+ return new GhostDropHint(this.node, this.$element, position);
+ }
+ };
+ FolderElement.prototype.getButton = function () {
+ return this.$element
+ .children(".jqtree-element")
+ .find("a.jqtree-toggler");
+ };
+ return FolderElement;
+}(NodeElement));
+exports.FolderElement = FolderElement;
+var BorderDropHint = (function () {
+ function BorderDropHint($element) {
+ var $div = $element.children(".jqtree-element");
+ var width = $element.width() - 4;
+ this.$hint = $('<span class="jqtree-border"></span>');
+ $div.append(this.$hint);
+ this.$hint.css({
+ width: width,
+ height: $div.outerHeight() - 4
+ });
+ }
+ BorderDropHint.prototype.remove = function () {
+ this.$hint.remove();
+ };
+ return BorderDropHint;
+}());
+exports.BorderDropHint = BorderDropHint;
+var GhostDropHint = (function () {
+ function GhostDropHint(node, $element, position) {
+ this.$element = $element;
+ this.node = node;
+ this.$ghost = $("<li class=\"jqtree_common jqtree-ghost\"><span
class=\"jqtree_common jqtree-circle\"></span>\n <span
class=\"jqtree_common jqtree-line\"></span></li>");
+ if (position === node_1.Position.After) {
+ this.moveAfter();
+ }
+ else if (position === node_1.Position.Before) {
+ this.moveBefore();
+ }
+ else if (position === node_1.Position.Inside) {
+ if (node.isFolder() && node.is_open) {
+ this.moveInsideOpenFolder();
+ }
+ else {
+ this.moveInside();
+ }
+ }
+ }
+ GhostDropHint.prototype.remove = function () {
+ this.$ghost.remove();
+ };
+ GhostDropHint.prototype.moveAfter = function () {
+ this.$element.after(this.$ghost);
+ };
+ GhostDropHint.prototype.moveBefore = function () {
+ this.$element.before(this.$ghost);
+ };
+ GhostDropHint.prototype.moveInsideOpenFolder = function () {
+ $(this.node.children[0].element).before(this.$ghost);
+ };
+ GhostDropHint.prototype.moveInside = function () {
+ this.$element.after(this.$ghost);
+ this.$ghost.addClass("jqtree-inside");
+ };
+ return GhostDropHint;
+}());
+exports.GhostDropHint = GhostDropHint;
/***/ }),
/* 13 */,
-/* 14 */,
-/* 15 */,
-/* 16 */,
-/* 17 */,
-/* 18 */,
-/* 19 */
+/* 14 */
/***/ (function(module, exports, __webpack_require__) {
module.exports = __webpack_require__(3);
Modified: branches/Version-2_0-branch/property/inc/class.botts.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.botts.inc.php
2017-09-01 12:28:15 UTC (rev 17023)
+++ branches/Version-2_0-branch/property/inc/class.botts.inc.php
2017-09-01 13:04:02 UTC (rev 17024)
@@ -288,6 +288,13 @@
'id' => 'b_account_id',
'name' => lang('budget account')
);
+
+ $columns['continuous'] = array
+ (
+ 'id' => 'continuous',
+ 'name' => lang('continuous')
+ );
+
}
$columns['ecodimb'] = array
Modified: branches/Version-2_0-branch/property/inc/class.sotts.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.sotts.inc.php
2017-09-01 12:28:15 UTC (rev 17023)
+++ branches/Version-2_0-branch/property/inc/class.sotts.inc.php
2017-09-01 13:04:02 UTC (rev 17024)
@@ -588,6 +588,7 @@
'tax_code' => 'fm_tts_tickets.tax_code',
'unspsc_code' => 'fm_tts_tickets.unspsc_code',
'b_account_id' => 'fm_tts_tickets.b_account_id',
+ 'continuous' => 'fm_tts_tickets.continuous',
);
$custom_cols = $this->custom->find('property',
'.ticket', 0, '', 'ASC', 'attrib_sort', true, true);
@@ -781,6 +782,7 @@
'tax_code' =>
$this->db->f('tax_code'),
'unspsc_code' =>
$this->db->f('unspsc_code'),
'b_account_id' =>
$this->db->f('b_account_id'),
+ 'continuous' =>
$this->db->f('continuous'),
);
foreach ($custom_cols as $custom_col)
@@ -868,6 +870,7 @@
$ticket['finnish_date2'] =
$this->db->f('finnish_date2');
$ticket['contact_id'] =
$this->db->f('contact_id');
$ticket['order_id'] = $this->db->f('order_id');
+ $ticket['continuous'] =
$this->db->f('continuous');
$ticket['vendor_id'] =
$this->db->f('vendor_id');
$ticket['contract_id'] =
$this->db->f('contract_id',true);
$ticket['service_id'] =
$this->db->f('service_id',true);
@@ -1735,6 +1738,7 @@
$value_set['ecodimb'] = $ticket['ecodimb'];
$value_set['branch_id'] = $ticket['branch_id'];
$value_set['tax_code'] = $ticket['tax_code'];
+ $value_set['continuous'] =
$ticket['continuous'];
if(isset($ticket['vendor_email']) &&
is_array($ticket['vendor_email']))
{
Modified: branches/Version-2_0-branch/property/inc/class.uitts.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.uitts.inc.php
2017-09-01 12:28:15 UTC (rev 17023)
+++ branches/Version-2_0-branch/property/inc/class.uitts.inc.php
2017-09-01 13:04:02 UTC (rev 17024)
@@ -3097,6 +3097,7 @@
'value_order_received' =>
$ticket['order_received'] ?
$GLOBALS['phpgw']->common->show_date($ticket['order_received']) : '[ DD/MM/YYYY
- H:i ]',
'value_order_received_amount' => (int)
$ticket['order_received_amount'],
'value_extra_mail_address' =>
$value_extra_mail_address,
+ 'value_continuous' => $ticket['continuous']
);
phpgwapi_jquery::load_widget('numberformat');
@@ -3611,6 +3612,22 @@
$user_email =
$GLOBALS['phpgw_info']['user']['preferences']['property']['email'];
$order_email_template =
$GLOBALS['phpgw_info']['user']['preferences']['property']['order_email_template'];
+ if
(!empty($this->bo->config->config_data['contact_at_location']))
+ {
+ $contact_at_location =
$this->bo->config->config_data['contact_at_location'];
+
+ $_responsible =
execMethod('property.boresponsible.get_responsible', array('location'=>
explode('-', $ticket['location_code']),
+ 'cat_id' => $ticket['cat_id']));
+
+ if($_responsible)
+ {
+ $prefs
= $this->bocommon->create_preferences('property', $_responsible);
+ $_responsible_name =
$GLOBALS['phpgw']->accounts->get($_responsible)->__toString();
+ $_responsible_email =
$prefs['email'];
+ $_responsible_cellphone =
$prefs['cellphone'];
+ }
+ }
+
$body = nl2br(str_replace(array
(
'__vendor_name__',
Modified:
branches/Version-2_0-branch/property/inc/cron/default/oppdater_betalte_faktura_BK.php
===================================================================
---
branches/Version-2_0-branch/property/inc/cron/default/oppdater_betalte_faktura_BK.php
2017-09-01 12:28:15 UTC (rev 17023)
+++
branches/Version-2_0-branch/property/inc/cron/default/oppdater_betalte_faktura_BK.php
2017-09-01 13:04:02 UTC (rev 17024)
@@ -156,14 +156,21 @@
}
break;
case 'ticket':
- $this->db->query("SELECT id
FROM fm_tts_tickets WHERE order_id= '{$voucher['order_id']}'", __LINE__,
__FILE__);
+ $this->db->query("SELECT id,
continuous FROM fm_tts_tickets WHERE order_id= '{$voucher['order_id']}'",
__LINE__, __FILE__);
$this->db->next_record();
$ticket_id = $this->db->f('id');
- $ticket = array(
- 'status' => 'C8'
//Avsluttet og fakturert (C)
- );
- $ok =
$sotts->update_status($ticket, $ticket_id);
+ if($this->db->f('continuous'))
+ {
+ $ok = true;
+ }
+ else
+ {
+ $ticket = array(
+
'status' => 'C8' //Avsluttet og fakturert (C)
+ );
+ $ok =
$sotts->update_status($ticket, $ticket_id);
+ }
break;
default:
throw new Exception('Order type
not supported');
Modified: branches/Version-2_0-branch/property/inc/hook_config.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/hook_config.inc.php
2017-09-01 12:28:15 UTC (rev 17023)
+++ branches/Version-2_0-branch/property/inc/hook_config.inc.php
2017-09-01 13:04:02 UTC (rev 17024)
@@ -466,6 +466,32 @@
}
/**
+ * Get HTML options with roles for responsibilities that should be
listed in a listbox
+ *
+ * @param $config
+ * @return string HTML options to be placed in a select
+ */
+ function list_contact_at_location( $config )
+ {
+ $assigned = isset($config['contact_at_location']) ?
$config['contact_at_location'] : 0;
+
+ $entries = execMethod('property.bogeneric.get_list',
array('type' => 'responsibility_role',
+ 'selected' => $assigned));
+
+ $out = '<option value="">' . lang('none selected') .
'</option>' . "\n";
+ foreach ($entries as $entry)
+ {
+ $selected = $entry['selected'] ? ' selected =
"selected"' : '';
+
+ $out .= <<<HTML
+ <option
value='{$entry['id']}'{$selected}>{$entry['name']}</option>
+HTML;
+ }
+ return $out;
+ }
+
+
+ /**
* Get HTML checkbox with filter buildingpart
*
* @param $config
Modified: branches/Version-2_0-branch/property/setup/setup.inc.php
===================================================================
--- branches/Version-2_0-branch/property/setup/setup.inc.php 2017-09-01
12:28:15 UTC (rev 17023)
+++ branches/Version-2_0-branch/property/setup/setup.inc.php 2017-09-01
13:04:02 UTC (rev 17024)
@@ -11,7 +11,7 @@
* @version $Id$
*/
$setup_info['property']['name'] = 'property';
- $setup_info['property']['version'] = '0.9.17.717';
+ $setup_info['property']['version'] = '0.9.17.718';
$setup_info['property']['app_order'] = 8;
$setup_info['property']['enable'] = 1;
$setup_info['property']['app_group'] = 'office';
Modified: branches/Version-2_0-branch/property/setup/tables_current.inc.php
===================================================================
--- branches/Version-2_0-branch/property/setup/tables_current.inc.php
2017-09-01 12:28:15 UTC (rev 17023)
+++ branches/Version-2_0-branch/property/setup/tables_current.inc.php
2017-09-01 13:04:02 UTC (rev 17024)
@@ -1178,7 +1178,8 @@
'order_received_amount' => array('type' =>
'decimal', 'precision' => '20', 'scale' => '2', 'nullable' => True, 'default'
=> '0.00'),
'mail_recipients' => array('type' => 'varchar',
'precision' => 255, 'nullable' => True),
'file_attachments' => array('type' =>
'varchar', 'precision' => 255, 'nullable' => True),
- 'delivery_address' => array('type' => 'text',
'nullable' => True)
+ 'delivery_address' => array('type' => 'text',
'nullable' => True),
+ 'continuous' => array('type' => 'int',
'precision' => 2, 'nullable' => True),
),
'pk' => array('id'),
'ix' => array(),
Modified: branches/Version-2_0-branch/property/setup/tables_update.inc.php
===================================================================
--- branches/Version-2_0-branch/property/setup/tables_update.inc.php
2017-09-01 12:28:15 UTC (rev 17023)
+++ branches/Version-2_0-branch/property/setup/tables_update.inc.php
2017-09-01 13:04:02 UTC (rev 17024)
@@ -9767,3 +9767,23 @@
return $GLOBALS['setup_info']['property']['currentver'];
}
}
+
+ /**
+ * Update property version from 0.9.17.717 to 0.9.17.718
+ *
+ */
+ $test[] = '0.9.17.717';
+
+ function property_upgrade0_9_17_717()
+ {
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
+ $GLOBALS['phpgw_setup']->oProc->AddColumn('fm_tts_tickets',
'continuous', array(
+ 'type' => 'int', 'precision' => 2, 'nullable' => true));
+
+ if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+ {
+ $GLOBALS['setup_info']['property']['currentver'] =
'0.9.17.718';
+ return $GLOBALS['setup_info']['property']['currentver'];
+ }
+ }
Modified: branches/Version-2_0-branch/property/templates/base/config.tpl
===================================================================
--- branches/Version-2_0-branch/property/templates/base/config.tpl
2017-09-01 12:28:15 UTC (rev 17023)
+++ branches/Version-2_0-branch/property/templates/base/config.tpl
2017-09-01 13:04:02 UTC (rev 17024)
@@ -460,6 +460,14 @@
</td>
</tr>
<tr>
+ <td>{lang_TTS_order_contact_at_location}.</td>
+ <td>
+ <select
name="newsettings[contact_at_location]">
+ {hook_list_contact_at_location}
+ </select>
+ </td>
+ </tr>
+ <tr>
<td>{lang_send_response_TTS}.</td>
<td>
<select
name="newsettings[tts_send_response]">
Modified: branches/Version-2_0-branch/property/templates/base/tts.xsl
===================================================================
--- branches/Version-2_0-branch/property/templates/base/tts.xsl 2017-09-01
12:28:15 UTC (rev 17023)
+++ branches/Version-2_0-branch/property/templates/base/tts.xsl 2017-09-01
13:04:02 UTC (rev 17024)
@@ -688,7 +688,7 @@
<xsl:attribute name="title">
<xsl:value-of select="$lang_sms_text"/>
</xsl:attribute>
-
<xsl:value-of select="$lang_sms_text"/>
+
<xsl:value-of select="$lang_sms_text"/>
</a>
</label>
<textarea
class="pure-input-1-2" rows="{textarearows}" id="response_text"
name="values[response_text]" onKeyUp="javascript: SmsCountKeyUp(160);"
onKeyDown="javascript: SmsCountKeyDown(160);" wrap="virtual">
@@ -763,6 +763,24 @@
</input>
</div>
<div
class="pure-control-group">
+
<xsl:variable name="lang_continuous">
+
<xsl:value-of select="php:function('lang', 'continuous')"/>
+
</xsl:variable>
+
<label for="name">
+
<xsl:value-of select="$lang_continuous"/>
+
</label>
+
<input type="checkbox" name="values[continuous]" value="1">
+
<xsl:attribute name="title">
+
<xsl:value-of select="$lang_continuous"/>
+
</xsl:attribute>
+
<xsl:if test="value_continuous = '1'">
+
<xsl:attribute name="checked">
+
<xsl:text>checked</xsl:text>
+
</xsl:attribute>
+
</xsl:if>
+
</input>
+ </div>
+ <div
class="pure-control-group">
<label>
<xsl:value-of select="php:function('lang', 'external project')"/>
</label>
@@ -1334,7 +1352,7 @@
<xsl:if test="simple !='1'">
<hr noshade="noshade" width="100%" align="center" size="1"/>
- <div class="pure-g">
+ <div class="pure-g">
<xsl:choose>
<xsl:when test="request_link != ''">
<xsl:variable name="request_link">
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [17024] Stable: Merge 17019:17023 from trunk,
sigurdne <=