[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [14920] Merge 14916:14919 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [14920] Merge 14916:14919 from trunk |
|
Date: |
Wed, 13 Apr 2016 09:36:19 +0000 |
Revision: 14920
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14920
Author: sigurdne
Date: 2016-04-13 09:36:18 +0000 (Wed, 13 Apr 2016)
Log Message:
-----------
Merge 14916:14919 from trunk
Modified Paths:
--------------
branches/Version-2_0-branch/booking/js/booking/schedule.js
branches/Version-2_0-branch/bookingfrontend/js/bookingfrontend/schedule.js
branches/Version-2_0-branch/property/inc/class.uilocation.inc.php
branches/Version-2_0-branch/rental/inc/class.socomposite.inc.php
branches/Version-2_0-branch/rental/inc/class.socontract.inc.php
branches/Version-2_0-branch/rental/inc/class.uicomposite.inc.php
branches/Version-2_0-branch/rental/inc/class.uicontract.inc.php
branches/Version-2_0-branch/rental/inc/class.uiparty.inc.php
Property Changed:
----------------
branches/Version-2_0-branch/
branches/Version-2_0-branch/booking/
branches/Version-2_0-branch/bookingfrontend/
Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/dev-syncromind:13653
/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
+ /branches/dev-syncromind:13653
/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
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
+ /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
Modified: branches/Version-2_0-branch/booking/js/booking/schedule.js
===================================================================
--- branches/Version-2_0-branch/booking/js/booking/schedule.js 2016-04-13
09:13:51 UTC (rev 14919)
+++ branches/Version-2_0-branch/booking/js/booking/schedule.js 2016-04-13
09:36:18 UTC (rev 14920)
@@ -56,6 +56,7 @@
changeMonth: true,
changeYear: true,
firstDay: 1,
+ dateFormat: 'yy-mm-dd',
onSelect: function (a, e)
{
if (a != schedule.dateSelected)
Property changes on: branches/Version-2_0-branch/bookingfrontend
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/stavangerkommune/bookingfrontend:9468-12740,12986
/trunk/bookingfrontend:14721-14732,14770-14783,14794-14808,14824-14825,14838,14886-14894,14906-14909
+ /branches/stavangerkommune/bookingfrontend:9468-12740,12986
/trunk/bookingfrontend:14721-14732,14770-14783,14794-14808,14824-14825,14838,14886-14894,14906-14909,14917-14919
Modified:
branches/Version-2_0-branch/bookingfrontend/js/bookingfrontend/schedule.js
===================================================================
--- branches/Version-2_0-branch/bookingfrontend/js/bookingfrontend/schedule.js
2016-04-13 09:13:51 UTC (rev 14919)
+++ branches/Version-2_0-branch/bookingfrontend/js/bookingfrontend/schedule.js
2016-04-13 09:36:18 UTC (rev 14920)
@@ -54,7 +54,7 @@
changeMonth: true,
changeYear: true,
firstDay: 1,
- dateFormat: 'yy,mm,dd',
+ dateFormat: 'yy-mm-dd',
onSelect: function (a, e)
{
if (a != schedule.dateSelected)
Modified: branches/Version-2_0-branch/property/inc/class.uilocation.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.uilocation.inc.php
2016-04-13 09:13:51 UTC (rev 14919)
+++ branches/Version-2_0-branch/property/inc/class.uilocation.inc.php
2016-04-13 09:36:18 UTC (rev 14920)
@@ -1113,7 +1113,7 @@
'action' =>
$GLOBALS['phpgw']->link('/index.php', array
(
'menuaction' =>
'rental.uicontract.index',
- 'search_type' =>
'location_id',
+ 'search_type' =>
'location_code',
'contract_status' =>
'all',
'populate_form' => 'yes'
)),
@@ -1127,7 +1127,7 @@
'action' =>
$GLOBALS['phpgw']->link('/index.php', array
(
'menuaction' =>
'rental.uicomposite.index',
- 'search_type' =>
'location_id',
+ 'search_type' =>
'location_code',
'populate_form' => 'yes'
)),
'parameters' =>
json_encode($parameters3)
Modified: branches/Version-2_0-branch/rental/inc/class.socomposite.inc.php
===================================================================
--- branches/Version-2_0-branch/rental/inc/class.socomposite.inc.php
2016-04-13 09:13:51 UTC (rev 14919)
+++ branches/Version-2_0-branch/rental/inc/class.socomposite.inc.php
2016-04-13 09:36:18 UTC (rev 14920)
@@ -44,7 +44,7 @@
$like_clauses[] =
"rental_composite.address_2 $this->like $like_pattern";
$like_clauses[] =
"rental_composite.house_number $this->like $like_pattern";
break;
- case "property_id":
+ case "location_code":
$like_clauses[] =
"rental_unit.location_code $this->like $like_pattern";
break;
case "all":
Modified: branches/Version-2_0-branch/rental/inc/class.socontract.inc.php
===================================================================
--- branches/Version-2_0-branch/rental/inc/class.socontract.inc.php
2016-04-13 09:13:51 UTC (rev 14919)
+++ branches/Version-2_0-branch/rental/inc/class.socontract.inc.php
2016-04-13 09:36:18 UTC (rev 14920)
@@ -128,7 +128,7 @@
case "composite_address":
$composite_address = true;
break;
- case "location_id":
+ case "location_code":
$like_clauses[] =
"r_u.location_code like '{$search_for}%'";
break;
case "all":
Modified: branches/Version-2_0-branch/rental/inc/class.uicomposite.inc.php
===================================================================
--- branches/Version-2_0-branch/rental/inc/class.uicomposite.inc.php
2016-04-13 09:13:51 UTC (rev 14919)
+++ branches/Version-2_0-branch/rental/inc/class.uicomposite.inc.php
2016-04-13 09:36:18 UTC (rev 14920)
@@ -44,8 +44,13 @@
array('id' => 'all', 'name' => lang('all')),
array('id' => 'name', 'name' => lang('name')),
array('id' => 'address', 'name' =>
lang('address')),
- array('id' => 'property_id', 'name' =>
lang('object_number'))
+ array('id' => 'location_code', 'name' =>
lang('object_number'))
);
+ $search_type = phpgw::get_var('search_type');
+ foreach ($search_option as &$entry)
+ {
+ $entry['selected'] = $entry['id'] ==
$search_type ? 1 : 0;
+ }
$filters[] = array
(
'type' => 'filter',
@@ -423,14 +428,6 @@
'name' =>
'availability_date_to',
'value' => '',
'text' =>
lang('to')
- ),
- array(
- 'type' =>
'link',
- 'value' =>
lang('new'),
- 'href' =>
self::link(array(
-
'menuaction' => 'rental.uicomposite.add'
- )),
- 'class' =>
'new_item'
)
)
)
@@ -448,6 +445,7 @@
'allrows' => true
)),
'allrows' => true,
+ 'new_item' =>
self::link(array('menuaction' => 'rental.uicomposite.add')),
'editor_action' => '',
'field' => array(),
'query' => phpgw::get_var('search_for')
@@ -861,7 +859,7 @@
'selected' => 0);
$contracts_search_options[] = array('id' =>
'composite_address', 'name' => lang('composite_address'),
'selected' => 0);
- $contracts_search_options[] = array('id' =>
'location_id', 'name' => lang('object_number'),
+ $contracts_search_options[] = array('id' =>
'location_code', 'name' => lang('object_number'),
'selected' => 0);
$status_options[] = array('id' => 'all', 'name'
=> lang('all'), 'selected' => 1);
Modified: branches/Version-2_0-branch/rental/inc/class.uicontract.inc.php
===================================================================
--- branches/Version-2_0-branch/rental/inc/class.uicontract.inc.php
2016-04-13 09:13:51 UTC (rev 14919)
+++ branches/Version-2_0-branch/rental/inc/class.uicontract.inc.php
2016-04-13 09:36:18 UTC (rev 14920)
@@ -109,8 +109,13 @@
array('id' => 'party_name', 'name' =>
lang('party_name')),
array('id' => 'composite', 'name' =>
lang('composite_name')),
array('id' => 'composite_address', 'name' =>
lang('composite_address')),
- array('id' => 'location_id', 'name' =>
lang('object_number'))
+ array('id' => 'location_code', 'name' =>
lang('object_number'))
);
+ $search_type = phpgw::get_var('search_type');
+ foreach ($search_option as &$entry)
+ {
+ $entry['selected'] = $entry['id'] ==
$search_type ? 1 : 0;
+ }
$filters[] = array
(
'type' => 'filter',
@@ -2024,7 +2029,7 @@
array('id' => 'all', 'name' =>
lang('all'), 'selected' => 1),
array('id' => 'name', 'name' =>
lang('name'), 'selected' => 0),
array('id' => 'address', 'name' =>
lang('address'), 'selected' => 0),
- array('id' => 'property_id', 'name' =>
lang('object_number'), 'selected' => 0)
+ array('id' => 'location_code', 'name'
=> lang('object_number'), 'selected' => 0)
);
$furnish_types_options = array();
Modified: branches/Version-2_0-branch/rental/inc/class.uiparty.inc.php
===================================================================
--- branches/Version-2_0-branch/rental/inc/class.uiparty.inc.php
2016-04-13 09:13:51 UTC (rev 14919)
+++ branches/Version-2_0-branch/rental/inc/class.uiparty.inc.php
2016-04-13 09:36:18 UTC (rev 14920)
@@ -433,14 +433,6 @@
'form' => array(
'toolbar' => array(
'item' => array(
- array(
- 'type' =>
'link',
- 'value' =>
lang('new'),
- 'href' =>
self::link(array(
-
'menuaction' => 'rental.uiparty.add'
- )),
- 'class' =>
'new_item'
- )
)
)
),
@@ -457,6 +449,7 @@
'allrows' => true
)),
'allrows' => true,
+ 'new_item' =>
self::link(array('menuaction' => 'rental.uiparty.add')),
'editor_action' => '',
'field' => array(
array(
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [14920] Merge 14916:14919 from trunk,
Sigurd Nes <=