[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [15298] Stable: Merge 15296:15297 from trunk
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [15298] Stable: Merge 15296:15297 from trunk |
|
Date: |
Thu, 16 Jun 2016 12:53:07 +0000 (UTC) |
Revision: 15298
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15298
Author: sigurdne
Date: 2016-06-16 12:53:06 +0000 (Thu, 16 Jun 2016)
Log Message:
-----------
Stable: Merge 15296:15297 from trunk
Modified Paths:
--------------
branches/Version-2_0-branch/booking/inc/class.uiapplication.inc.php
branches/Version-2_0-branch/booking/inc/class.uievent.inc.php
branches/Version-2_0-branch/bookingfrontend/inc/class.uiapplication.inc.php
branches/Version-2_0-branch/bookingfrontend/templates/base/application.xsl
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/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
+ /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
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
+ /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
Modified: branches/Version-2_0-branch/booking/inc/class.uiapplication.inc.php
===================================================================
--- branches/Version-2_0-branch/booking/inc/class.uiapplication.inc.php
2016-06-16 12:51:43 UTC (rev 15297)
+++ branches/Version-2_0-branch/booking/inc/class.uiapplication.inc.php
2016-06-16 12:53:06 UTC (rev 15298)
@@ -43,7 +43,9 @@
$this->resource_bo = CreateObject('booking.boresource');
$this->building_bo = CreateObject('booking.bobuilding');
$this->organization_bo =
CreateObject('booking.boorganization');
- $this->document_bo =
CreateObject('booking.bodocument_building');
+ $this->document_building =
CreateObject('booking.bodocument_building');
+ $this->document_resource =
CreateObject('booking.bodocument_resource');
+
self::set_active_menu('booking::applications');
$this->fields = array('description', 'equipment',
'resources', 'activity_id',
'building_id', 'building_name', 'contact_name',
@@ -550,8 +552,19 @@
$comment_text = lang('The user has accepted the
following documents') . ': ';
foreach ($application['accepted_documents'] as $doc)
{
- $doc_id = substr($doc, strrpos($doc, ':') + 1);
// finding the document_building.id
- $document =
$this->document_bo->read_single($doc_id);
+ $doc_info = explode('::', $doc);
+ $doc_type = $doc_info[0];
+ $doc_id = $doc_info[1];
+ switch ($doc_type)
+ {
+ default:
+ case 'building':
+ $document =
$this->document_building->read_single($doc_id);
+ break;
+ case 'resource':
+ $document =
$this->document_resource->read_single($doc_id);
+ break;
+ }
$comment_text .= $document['description'] . '
(' . $document['name'] . '), ';
}
$comment_text = substr($comment_text, 0, -2);
Modified: branches/Version-2_0-branch/booking/inc/class.uievent.inc.php
===================================================================
--- branches/Version-2_0-branch/booking/inc/class.uievent.inc.php
2016-06-16 12:51:43 UTC (rev 15297)
+++ branches/Version-2_0-branch/booking/inc/class.uievent.inc.php
2016-06-16 12:53:06 UTC (rev 15298)
@@ -369,11 +369,11 @@
foreach ($_POST['from_'] as &$from)
{
-// $from = date("Y-m-d H:i:s",
phpgwapi_datetime::date_to_timestamp($from));
+ $from = date("Y-m-d H:i:s",
phpgwapi_datetime::date_to_timestamp($from));
}
foreach ($_POST['to_'] as &$to)
{
-// $to = date("Y-m-d H:i:s",
phpgwapi_datetime::date_to_timestamp($to));
+ $to = date("Y-m-d H:i:s",
phpgwapi_datetime::date_to_timestamp($to));
}
$event['dates'] = array_map(array(self,
'_combine_dates'), $_POST['from_'], $_POST['to_']);
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,14917-14919,14924-14978,14980-15258
+ /branches/stavangerkommune/bookingfrontend:9468-12740,12986
/trunk/bookingfrontend:14721-14732,14770-14783,14794-14808,14824-14825,14838,14886-14894,14906-14909,14917-14919,14924-14978,14980-15258,15297
Modified:
branches/Version-2_0-branch/bookingfrontend/inc/class.uiapplication.inc.php
===================================================================
--- branches/Version-2_0-branch/bookingfrontend/inc/class.uiapplication.inc.php
2016-06-16 12:51:43 UTC (rev 15297)
+++ branches/Version-2_0-branch/bookingfrontend/inc/class.uiapplication.inc.php
2016-06-16 12:53:06 UTC (rev 15298)
@@ -129,7 +129,17 @@
phpgwapi_jquery::formvalidator_generate(array('file'),
'file_form');
- self::render_template_xsl('application',
array('application' => $application,
- 'audience' => $audience, 'agegroups' =>
$agegroups, 'frontend' => 'true'));
+ $config = CreateObject('phpgwapi.config', 'booking');
+ $config->read();
+ $application_text = $config->config_data;
+
+ self::render_template_xsl('application', array(
+ 'application' => $application,
+ 'audience' => $audience,
+ 'agegroups' => $agegroups,
+ 'frontend' => 'true',
+ 'config' => $application_text
+ )
+ );
}
}
\ No newline at end of file
Modified:
branches/Version-2_0-branch/bookingfrontend/templates/base/application.xsl
===================================================================
--- branches/Version-2_0-branch/bookingfrontend/templates/base/application.xsl
2016-06-16 12:51:43 UTC (rev 15297)
+++ branches/Version-2_0-branch/bookingfrontend/templates/base/application.xsl
2016-06-16 12:53:06 UTC (rev 15298)
@@ -393,9 +393,11 @@
<div class="heading">
<br />8. <xsl:value-of
select="php:function('lang', 'Terms and conditions')" />
</div>
- <p>
- <xsl:value-of
select="php:function('lang', 'All that borrow premises from Bergen Kommune must
verify that they have read the terms and conditions, this is usually fire
regulations and house rules.')" />
- </p>
+ <xsl:if
test="config/application_terms">
+ <p>
+ <xsl:value-of
select="config/application_terms"/>
+ </p>
+ </xsl:if>
<br />
<div
id='regulation_documents'> </div>
<br />
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [15298] Stable: Merge 15296:15297 from trunk,
sigurdne <=