[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [15570] Stable: Merge 15567:15569 from trunk
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [15570] Stable: Merge 15567:15569 from trunk |
|
Date: |
Fri, 2 Sep 2016 13:41:17 +0000 (UTC) |
Revision: 15570
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15570
Author: sigurdne
Date: 2016-09-02 13:41:17 +0000 (Fri, 02 Sep 2016)
Log Message:
-----------
Stable: Merge 15567:15569 from trunk
Modified Paths:
--------------
branches/Version-2_0-branch/booking/inc/class.boseason.inc.php
branches/Version-2_0-branch/booking/inc/class.socommon.inc.php
branches/Version-2_0-branch/booking/inc/class.uiallocation.inc.php
branches/Version-2_0-branch/helpdesk/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,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566
+ /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,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569
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,15287-15288,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15360-15541,15543-15566
+ /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
Modified: branches/Version-2_0-branch/booking/inc/class.boseason.inc.php
===================================================================
--- branches/Version-2_0-branch/booking/inc/class.boseason.inc.php
2016-09-02 13:39:58 UTC (rev 15569)
+++ branches/Version-2_0-branch/booking/inc/class.boseason.inc.php
2016-09-02 13:41:17 UTC (rev 15570)
@@ -149,12 +149,12 @@
{
if ($write)
{
-
$this->so->db->transaction_begin();
+ $this->so->transaction_begin();
foreach ($valid as $alloc)
{
$this->bo_allocation->add($alloc);
}
-
$this->so->db->transaction_commit();
+ $this->so->transaction_commit();
}
return array('valid' => $valid,
'invalid' => $invalid);
}
Modified: branches/Version-2_0-branch/booking/inc/class.socommon.inc.php
===================================================================
--- branches/Version-2_0-branch/booking/inc/class.socommon.inc.php
2016-09-02 13:39:58 UTC (rev 15569)
+++ branches/Version-2_0-branch/booking/inc/class.socommon.inc.php
2016-09-02 13:41:17 UTC (rev 15570)
@@ -48,6 +48,36 @@
$this->like = & $this->db->like;
}
+ /**
+ * Begin transaction
+ *
+ * @return integer|bool current transaction id
+ */
+ public function transaction_begin()
+ {
+ return $this->db->transaction_begin();
+ }
+
+ /**
+ * Complete the transaction
+ *
+ * @return bool True if sucessful, False if fails
+ */
+ public function transaction_commit()
+ {
+ return $this->db->transaction_commit();
+ }
+
+ /**
+ * Rollback the current transaction
+ *
+ * @return bool True if sucessful, False if fails
+ */
+ public function transaction_abort()
+ {
+ return $this->db->transaction_abort();
+ }
+
public function get_db()
{
return $this->db;
Modified: branches/Version-2_0-branch/booking/inc/class.uiallocation.inc.php
===================================================================
--- branches/Version-2_0-branch/booking/inc/class.uiallocation.inc.php
2016-09-02 13:39:58 UTC (rev 15569)
+++ branches/Version-2_0-branch/booking/inc/class.uiallocation.inc.php
2016-09-02 13:41:17 UTC (rev 15570)
@@ -287,7 +287,7 @@
if ($_SERVER['REQUEST_METHOD'] == 'POST')
{
- $season =
$this->season_bo->read_single($_POST['season_id']);
+ $season =
$this->season_bo->read_single(phpgw::get_var('season_id', 'int'));
array_set_default($_POST, 'resources', array());
$allocation = extract_values($_POST,
$this->fields);
if ($_POST['cost'])
@@ -301,6 +301,17 @@
$to_date = $_POST['to_'];
$from_date_arr = explode(' ', $_POST['from_']);
$to_date_arr = explode(' ', $_POST['to_']);
+ if(count($from_date_arr) == 2)
+ {
+ $from_time = $from_date_arr[1];
+ $to_time = $to_date_arr[1];
+ }
+ else
+ {
+ $from_time = $_POST['from_'];
+ $to_time = $_POST['to_'];
+ }
+
if(!isset($_POST['weekday']))
{
$_POST['weekday'] = strtolower
(date('l', phpgwapi_datetime::date_to_timestamp($_POST['from_'])));
@@ -310,8 +321,8 @@
// $allocation['from_'] = strftime("%Y-%m-%d
%H:%M", strtotime($_POST['weekday'] . " " . $_POST['from_']));
// $allocation['to_'] = strftime("%Y-%m-%d %H:%M",
strtotime($_POST['weekday'] . " " . $_POST['to_']));
- $allocation['from_'] = strftime("%Y-%m-%d
%H:%M", strtotime($_POST['weekday'] . " " . $from_date_arr[1]));
- $allocation['to_'] = strftime("%Y-%m-%d %H:%M",
strtotime($_POST['weekday'] . " " . $to_date_arr[1]));
+ $allocation['from_'] = strftime("%Y-%m-%d
%H:%M", strtotime($_POST['weekday'] . " " . $from_time));
+ $allocation['to_'] = strftime("%Y-%m-%d %H:%M",
strtotime($_POST['weekday'] . " " . $to_time));
if (($_POST['weekday'] != 'sunday' && date('w')
> date('w', strtotime($_POST['weekday']))) || (date('w') == '0' && date('w') <
date('w', strtotime($_POST['weekday']))))
{
@@ -398,14 +409,14 @@
}
else
{
- $dateTimeFrom = phpgw::get_var('from_',
'string');
- $dateTimeTo = phpgw::get_var('to_', 'string');
+ $dateTimeFrom = phpgw::get_var('from_',
'string', 'POST');
+ $dateTimeTo = phpgw::get_var('to_', 'string',
'POST');
$dateTimeFromE = explode(" ", $dateTimeFrom[0]);
$dateTimeToE = explode(" ", $dateTimeTo[0]);
if (phpgw::get_var('from_', 'string') < 14)
{
- $timeFrom[] = phpgw::get_var('from_',
'string');
- $timeTo[] = phpgw::get_var('to_',
'string');
+ $timeFrom[] = phpgw::get_var('from_',
'string', 'POST');
+ $timeTo[] = phpgw::get_var('to_',
'string', 'POST');
}
else
{
Modified: branches/Version-2_0-branch/helpdesk/inc/class.uitts.inc.php
===================================================================
--- branches/Version-2_0-branch/helpdesk/inc/class.uitts.inc.php
2016-09-02 13:39:58 UTC (rev 15569)
+++ branches/Version-2_0-branch/helpdesk/inc/class.uitts.inc.php
2016-09-02 13:41:17 UTC (rev 15570)
@@ -312,13 +312,13 @@
foreach($name_temp as $_key => $_name)
{
- array_push($name,$_key);
+ array_push($name,$_key);
}
foreach($descr_temp as $_key => $_name)
{
- array_push($descr,$_name);
+ array_push($descr,$_name);
}
if($this->_show_finnish_date)
@@ -395,7 +395,7 @@
}
else
{
- return lang('delete failed');
+ return lang('delete failed');
}
}
@@ -586,7 +586,8 @@
$filter_tts_assigned_to_me =
$GLOBALS['phpgw_info']['user']['preferences']['helpdesk']['tts_assigned_to_me'];
- $values_combo_box[4] =
$this->bocommon->get_user_list_right2('filter', PHPGW_ACL_EDIT, $this->user_id,
$this->acl_location);
+ $values_combo_box[4] =
$this->_get_user_list($this->user_id);
+
array_unshift($values_combo_box[4], array(
'id' => -1 *
$GLOBALS['phpgw_info']['user']['account_id'],
'name' => lang('my assigned tickets'),
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [15570] Stable: Merge 15567:15569 from trunk,
sigurdne <=