[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [16426] Stable: Merge 16421:16425 from trunk
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [16426] Stable: Merge 16421:16425 from trunk |
|
Date: |
Sun, 12 Mar 2017 12:31:13 -0400 (EDT) |
Revision: 16426
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16426
Author: sigurdne
Date: 2017-03-12 12:31:12 -0400 (Sun, 12 Mar 2017)
Log Message:
-----------
Stable: Merge 16421:16425 from trunk
Modified Paths:
--------------
branches/Version-2_0-branch/eventplanner/inc/class.bobooking.inc.php
branches/Version-2_0-branch/eventplanner/inc/class.sobooking.inc.php
branches/Version-2_0-branch/eventplanner/inc/class.uiapplication.inc.php
branches/Version-2_0-branch/eventplanner/inc/class.uicustomer.inc.php
branches/Version-2_0-branch/eventplanner/inc/class.uievents.inc.php
branches/Version-2_0-branch/eventplanner/inc/model/class.booking.inc.php
branches/Version-2_0-branch/eventplanner/setup/phpgw_no.lang
branches/Version-2_0-branch/eventplanner/templates/base/booking.xsl
branches/Version-2_0-branch/eventplanner/templates/base/customer.xsl
branches/Version-2_0-branch/eventplannerfrontend/templates/base/booking.xsl
branches/Version-2_0-branch/eventplannerfrontend/templates/base/customer.xsl
branches/Version-2_0-branch/phpgwapi/inc/class.socommon.inc.php
Property Changed:
----------------
branches/Version-2_0-branch/
Index: branches/Version-2_0-branch
===================================================================
--- branches/Version-2_0-branch 2017-03-12 16:29:12 UTC (rev 16425)
+++ branches/Version-2_0-branch 2017-03-12 16:31:12 UTC (rev 16426)
Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
/branches/dev-syncromind:13653
/branches/dev-syncromind-2:14933-16394
/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
\ 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
\ No newline at end of property
Modified: branches/Version-2_0-branch/eventplanner/inc/class.bobooking.inc.php
===================================================================
--- branches/Version-2_0-branch/eventplanner/inc/class.bobooking.inc.php
2017-03-12 16:29:12 UTC (rev 16425)
+++ branches/Version-2_0-branch/eventplanner/inc/class.bobooking.inc.php
2017-03-12 16:31:12 UTC (rev 16426)
@@ -118,12 +118,22 @@
$bookings =
eventplanner_sobooking::get_instance()->read($params);
+ $existing_booking_ids = array();
+ foreach ($bookings['results'] as $booking)
+ {
+ $existing_booking_ids[] =
$booking['id'];
+ }
+
$number_of_active =
(int)$bookings['total_records'];
$limit = (int)$application->num_granted_events;
-
+ $error = false;
foreach ($ids as $id)
{
+ if(in_array($id, $existing_booking_ids)
)
+ {
+ continue;
+ }
if($limit > $number_of_active)
{
$_ids[] = $id;
@@ -131,11 +141,16 @@
}
else
{
+ $error = true;
$message = lang('maximum of
granted events are reached');
phpgwapi_cache::message_set($message, 'error');
break;
}
}
+ if($ids && !$_ids && !$error)
+ {
+ return true;
+ }
}
else if ($action == 'delete' && $ids)
{
Modified: branches/Version-2_0-branch/eventplanner/inc/class.sobooking.inc.php
===================================================================
--- branches/Version-2_0-branch/eventplanner/inc/class.sobooking.inc.php
2017-03-12 16:29:12 UTC (rev 16425)
+++ branches/Version-2_0-branch/eventplanner/inc/class.sobooking.inc.php
2017-03-12 16:31:12 UTC (rev 16426)
@@ -152,6 +152,16 @@
$where = 'AND';
break;
+ case 'disconnect':
+ $sql = "UPDATE eventplanner_booking SET"
+ . " customer_id = NULL,"
+ . " customer_contact_name = NULL,"
+ . " customer_contact_email = NULL,"
+ . " customer_contact_phone = NULL,"
+ . " location = NULL";
+ $where = 'WHERE';
+ break;
+
default:
throw new Exception("action {$action}
not supported");
break;
Modified:
branches/Version-2_0-branch/eventplanner/inc/class.uiapplication.inc.php
===================================================================
--- branches/Version-2_0-branch/eventplanner/inc/class.uiapplication.inc.php
2017-03-12 16:29:12 UTC (rev 16425)
+++ branches/Version-2_0-branch/eventplanner/inc/class.uiapplication.inc.php
2017-03-12 16:31:12 UTC (rev 16426)
@@ -346,6 +346,13 @@
'type' => 'custom',
'custom_code' => "
onActionsClick('edit');"
+ ),
+ array(
+ 'my_name' => 'disconnect',
+ 'text' => lang('disconnect'),
+ 'type' => 'custom',
+ 'custom_code' => "
+
onActionsClick('disconnect');"
)
);
Modified: branches/Version-2_0-branch/eventplanner/inc/class.uicustomer.inc.php
===================================================================
--- branches/Version-2_0-branch/eventplanner/inc/class.uicustomer.inc.php
2017-03-12 16:29:12 UTC (rev 16425)
+++ branches/Version-2_0-branch/eventplanner/inc/class.uicustomer.inc.php
2017-03-12 16:31:12 UTC (rev 16426)
@@ -194,8 +194,11 @@
$tabs['first_tab'] = array(
'label' => lang('customer'),
'link' => '#first_tab',
- 'function' => "set_tab('first_tab')"
);
+ $tabs['booking'] = array(
+ 'label' => lang('booking'),
+ 'link' => '#booking',
+ );
$bocommon = CreateObject('property.bocommon');
@@ -224,6 +227,31 @@
)
);
+ $dates_def = array(
+ array('key' => 'id', 'label' => lang('id'),
'sortable' => true, 'resizeable' => true,'formatter' =>
'JqueryPortico.formatLink'),
+ array('key' => 'from_', 'label' =>
lang('From'), 'sortable' => false, 'resizeable' => true),
+ array('key' => 'to_', 'label' => lang('To'),
'sortable' => false, 'resizeable' => true),
+ array('key' => 'status', 'label' =>
lang('status'), 'sortable' => false, 'resizeable' => true),
+ array('key' => 'vendor_name', 'label' =>
lang('vendor'), 'sortable' => true, 'resizeable' => true),
+ array('key' => 'location', 'label' =>
lang('location'), 'sortable' => false, 'resizeable' => true),
+ array('key' => 'comment', 'label' =>
lang('Note'), 'sortable' => false, 'resizeable' => true),
+ array('key' => 'application_id', 'hidden' =>
true),
+ );
+
+ $datatable_def[] = array(
+ 'container' => 'datatable-container_1',
+ 'requestUrl' =>
json_encode(self::link(array('menuaction' =>
"{$this->currentapp}.uibooking.query_relaxed",
+ 'filter_customer_id' => $id,
+ 'filter_active' => 1,
+ 'phpgw_return_as' => 'json'))),
+ 'ColumnDefs' => $dates_def,
+ 'data' => json_encode(array()),
+ 'config' => array(
+ array('disableFilter' => true),
+ array('disablePagination' => true)
+ )
+ );
+
$data = array(
'datatable_def' => $datatable_def,
'form_action' => self::link(array('menuaction'
=> "{$this->currentapp}.uicustomer.save")),
Modified: branches/Version-2_0-branch/eventplanner/inc/class.uievents.inc.php
===================================================================
--- branches/Version-2_0-branch/eventplanner/inc/class.uievents.inc.php
2017-03-12 16:29:12 UTC (rev 16425)
+++ branches/Version-2_0-branch/eventplanner/inc/class.uievents.inc.php
2017-03-12 16:31:12 UTC (rev 16426)
@@ -195,8 +195,7 @@
$tabs = array();
$tabs['first_tab'] = array(
'label' => lang('event'),
- 'link' => '#first_tab',
- 'function' => "set_tab('first_tab')"
+ 'link' => '#first_tab'
);
@@ -211,7 +210,6 @@
array('key' => 'application_id', 'hidden' =>
true),
);
-
$datatable_def[] = array(
'container' => 'datatable-container_0',
@@ -259,7 +257,7 @@
self::render_template_xsl(array('events',
'application_info', 'datatable_inline'), array('edit' => $data));
}
-
+
public function save()
{
//Nothing to do here
Modified:
branches/Version-2_0-branch/eventplanner/inc/model/class.booking.inc.php
===================================================================
--- branches/Version-2_0-branch/eventplanner/inc/model/class.booking.inc.php
2017-03-12 16:29:12 UTC (rev 16425)
+++ branches/Version-2_0-branch/eventplanner/inc/model/class.booking.inc.php
2017-03-12 16:31:12 UTC (rev 16426)
@@ -50,6 +50,7 @@
$to_,
$application_id,
$application_name,
+ $vendor_name,
$customer_id,
$customer_name,
$customer_contact_name,
@@ -57,6 +58,7 @@
$customer_contact_phone,
$location,
$comments,
+ $comment,
$created,
$secret;
@@ -104,6 +106,7 @@
),
'active' => array('action'=> PHPGW_ACL_ADD |
PHPGW_ACL_EDIT,
'type' => 'int',
+ 'public' => true,
'history' => true
),
'completed' => array('action'=> PHPGW_ACL_EDIT,
@@ -146,6 +149,17 @@
'column' => 'title'
)
),
+ 'vendor_name' => array('action'=>
PHPGW_ACL_READ,
+ 'type' => 'string',
+ 'query' => true,
+ 'label' => 'vendor',
+ 'public' => true,
+ 'multiple_join' => array(
+ 'statement' => 'LEFT JOIN
eventplanner_application ON eventplanner_application.id =
eventplanner_booking.application_id'
+
. ' LEFT JOIN eventplanner_vendor ON eventplanner_application.vendor_id =
eventplanner_vendor.id',
+ 'column' =>
'eventplanner_vendor.name'
+ )
+ ),
'customer_id' => array('action'=> PHPGW_ACL_ADD
| PHPGW_ACL_EDIT,
'type' => 'int',
'label' => 'customer',
@@ -209,6 +223,11 @@
'column' => array('time',
'author', 'comment', 'type'),
'order' => array('sort' =>
'time', 'dir' => 'ASC')
)),
+ 'comment' => array(
+ 'action'=> PHPGW_ACL_ADD |
PHPGW_ACL_EDIT,
+ 'type' => 'string',
+ 'related' => true,
+ ),
'created' => array('action'=> PHPGW_ACL_READ,
'type' => 'date',
'label' => 'created',
Modified: branches/Version-2_0-branch/eventplanner/setup/phpgw_no.lang
===================================================================
--- branches/Version-2_0-branch/eventplanner/setup/phpgw_no.lang
2017-03-12 16:29:12 UTC (rev 16425)
+++ branches/Version-2_0-branch/eventplanner/setup/phpgw_no.lang
2017-03-12 16:31:12 UTC (rev 16426)
@@ -111,4 +111,5 @@
read eventplanner no Les
permission eventplanner no Rettighet
maximum number of events eventplanner no Maksimum antall
arrangement
-number of users eventplanner no Ca. antall brukere
\ No newline at end of file
+number of users eventplanner no Ca. antall brukere
+disconnect eventplanner no Kople fra
\ No newline at end of file
Modified: branches/Version-2_0-branch/eventplanner/templates/base/booking.xsl
===================================================================
--- branches/Version-2_0-branch/eventplanner/templates/base/booking.xsl
2017-03-12 16:29:12 UTC (rev 16425)
+++ branches/Version-2_0-branch/eventplanner/templates/base/booking.xsl
2017-03-12 16:31:12 UTC (rev 16426)
@@ -336,7 +336,7 @@
<xsl:value-of
select="booking/location"/>
</textarea>
</div>
- <div class="pure-control-group">
+ <!--div
class="pure-control-group">
<label>
<xsl:value-of
select="php:function('lang', 'remark')"/>
</label>
@@ -343,7 +343,7 @@
<textarea cols="47"
rows="7" name="remark">
<xsl:value-of
select="booking/remark"/>
</textarea>
- </div>
+ </div-->
<div class="pure-control-group">
<label>
<xsl:value-of
select="php:function('lang', 'comment')"/>
Modified: branches/Version-2_0-branch/eventplanner/templates/base/customer.xsl
===================================================================
--- branches/Version-2_0-branch/eventplanner/templates/base/customer.xsl
2017-03-12 16:29:12 UTC (rev 16425)
+++ branches/Version-2_0-branch/eventplanner/templates/base/customer.xsl
2017-03-12 16:31:12 UTC (rev 16426)
@@ -348,6 +348,28 @@
</div>
</fieldset>
</div>
+ <div id="booking">
+ <fieldset>
+ <div class="pure-control-group">
+ <label>
+ <xsl:value-of
select="php:function('lang', 'booking')"/>
+ </label>
+ <div
class="pure-custom">
+ <xsl:for-each
select="datatable_def">
+ <xsl:if
test="container = 'datatable-container_1'">
+
<xsl:call-template name="table_setup">
+
<xsl:with-param name="container" select ='container'/>
+
<xsl:with-param name="requestUrl" select ='requestUrl'/>
+
<xsl:with-param name="ColumnDefs" select ='ColumnDefs'/>
+
<xsl:with-param name="data" select ='data'/>
+
<xsl:with-param name="config" select ='config'/>
+
</xsl:call-template>
+
</xsl:if>
+ </xsl:for-each>
+ </div>
+ </div>
+ </fieldset>
+ </div>
</div>
<div class="proplist-col">
<input type="submit" class="pure-button
pure-button-primary" name="save">
Modified:
branches/Version-2_0-branch/eventplannerfrontend/templates/base/booking.xsl
===================================================================
--- branches/Version-2_0-branch/eventplannerfrontend/templates/base/booking.xsl
2017-03-12 16:29:12 UTC (rev 16425)
+++ branches/Version-2_0-branch/eventplannerfrontend/templates/base/booking.xsl
2017-03-12 16:31:12 UTC (rev 16426)
@@ -336,7 +336,7 @@
<xsl:value-of
select="booking/location"/>
</textarea>
</div>
- <div class="pure-control-group">
+ <!--div
class="pure-control-group">
<label>
<xsl:value-of
select="php:function('lang', 'remark')"/>
</label>
@@ -369,7 +369,7 @@
</xsl:if>
</xsl:for-each>
</div>
- </div>
+ </div-->
</fieldset>
</div>
<div id="reports">
Modified:
branches/Version-2_0-branch/eventplannerfrontend/templates/base/customer.xsl
===================================================================
---
branches/Version-2_0-branch/eventplannerfrontend/templates/base/customer.xsl
2017-03-12 16:29:12 UTC (rev 16425)
+++
branches/Version-2_0-branch/eventplannerfrontend/templates/base/customer.xsl
2017-03-12 16:31:12 UTC (rev 16426)
@@ -274,6 +274,29 @@
</div>
</fieldset>
</div>
+ <div id="booking">
+ <fieldset>
+ <div class="pure-control-group">
+ <label>
+ <xsl:value-of
select="php:function('lang', 'booking')"/>
+ </label>
+ <div
class="pure-custom">
+ <xsl:for-each
select="datatable_def">
+ <xsl:if
test="container = 'datatable-container_1'">
+
<xsl:call-template name="table_setup">
+
<xsl:with-param name="container" select ='container'/>
+
<xsl:with-param name="requestUrl" select ='requestUrl'/>
+
<xsl:with-param name="ColumnDefs" select ='ColumnDefs'/>
+
<xsl:with-param name="data" select ='data'/>
+
<xsl:with-param name="config" select ='config'/>
+
</xsl:call-template>
+
</xsl:if>
+ </xsl:for-each>
+ </div>
+ </div>
+ </fieldset>
+ </div>
+
</div>
<div class="proplist-col">
<input type="submit" class="pure-button
pure-button-primary" name="save">
Modified: branches/Version-2_0-branch/phpgwapi/inc/class.socommon.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/inc/class.socommon.inc.php
2017-03-12 16:29:12 UTC (rev 16425)
+++ branches/Version-2_0-branch/phpgwapi/inc/class.socommon.inc.php
2017-03-12 16:31:12 UTC (rev 16426)
@@ -643,8 +643,13 @@
$join_table_alias =
$this->build_join_table_alias($field, $params);
$cols[] =
"{$join_table_alias}.{$params['join']['column']} AS {$field}";
- $joins[] = "LEFT JOIN
{$params['join']['table']} AS {$join_table_alias}
ON({$join_table_alias}.{$params['join']['key']}={$this->table_name}.{$params['join']['fkey']})";
+ $joins[] = " LEFT JOIN
{$params['join']['table']} AS {$join_table_alias}
ON({$join_table_alias}.{$params['join']['key']}={$this->table_name}.{$params['join']['fkey']})";
}
+ else if (isset($params['multiple_join']) &&
$params['multiple_join'])
+ {
+ $joins[] = "
{$params['multiple_join']['statement']}";
+ $cols[] =
"{$params['multiple_join']['column']} AS {$field}";
+ }
else
{
$value_expression =
isset($params['expression']) ?
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [16426] Stable: Merge 16421:16425 from trunk,
sigurdne <=