[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [6625] bkbooking: bugfix
From: |
Kjell Arne Espedal |
Subject: |
[Fmsystem-commits] [6625] bkbooking: bugfix |
Date: |
Mon, 22 Nov 2010 13:18:13 +0000 |
Revision: 6625
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6625
Author: kjell
Date: 2010-11-22 13:18:11 +0000 (Mon, 22 Nov 2010)
Log Message:
-----------
bkbooking: bugfix
Modified Paths:
--------------
trunk/bookingfrontend/inc/class.uibooking.inc.php
trunk/bookingfrontend/setup/phpgw_no.lang
trunk/bookingfrontend/templates/base/booking_edit_preview.xsl
Modified: trunk/bookingfrontend/inc/class.uibooking.inc.php
===================================================================
--- trunk/bookingfrontend/inc/class.uibooking.inc.php 2010-11-22 11:46:46 UTC
(rev 6624)
+++ trunk/bookingfrontend/inc/class.uibooking.inc.php 2010-11-22 13:18:11 UTC
(rev 6625)
@@ -368,7 +368,7 @@
$params['filters']['season_id']
= $booking['season_id'];
$params['filters']['group_id']
= $booking['group_id'];
- $booking =
$this->bo->so->read($params);
+ $bookings =
$this->bo->so->read($params);
if ($step == 2)
{
@@ -381,7 +381,7 @@
if ($step == 3)
{
-
foreach($booking['results'] as $b)
+
foreach($bookings['results'] as $b)
{
//reformatting
the post variable to fit the booking object
$temp_agegroup
= array();
@@ -404,13 +404,16 @@
$errors =
$this->bo->validate($b);
if(!$errors)
{
+
$receipt = $this->bo->update($b);
$update_count++;
+
}
}
unset($_SESSION['female']);
unset($_SESSION['male']);
unset($_SESSION['audience']);
+
}
}
}
@@ -419,9 +422,9 @@
self::add_javascript('bookingfrontend',
'bookingfrontend', 'booking.js');
if ($step < 2) {
$booking['resources_json'] =
json_encode(array_map('intval', $booking['resources']));
+ $booking['organization_name'] =
$group['organization_name'];
}
$booking['cancel_link'] = self::link(array('menuaction'
=> 'bookingfrontend.uibuilding.schedule', 'id' => $booking['building_id']));
- $booking['update_link'] = self::link(array('menuaction'
=> 'bookingfrontend.uibooking.massupdate', 'id' => $booking['id']));
$agegroups = $this->agegroup_bo->fetch_age_groups();
$agegroups = $agegroups['results'];
$audience = $this->audience_bo->fetch_target_audience();
@@ -431,8 +434,6 @@
$group =
$this->group_bo->so->read_single($booking['group_id']);
$groups =
$this->group_bo->so->read(array('filters'=>array('organization_id'=>$group['organization_id'],
'active'=>1)));
$groups = $groups['results'];
- $booking['organization_name'] =
$group['organization_name'];
-
if ($step < 2)
{
self::render_template('booking_edit',
array('booking' => $booking,
Modified: trunk/bookingfrontend/setup/phpgw_no.lang
===================================================================
--- trunk/bookingfrontend/setup/phpgw_no.lang 2010-11-22 11:46:46 UTC (rev
6624)
+++ trunk/bookingfrontend/setup/phpgw_no.lang 2010-11-22 13:18:11 UTC (rev
6625)
@@ -320,3 +320,4 @@
Confirm e-mail address bookingfrontend no Bekreft e-postadressen
The e-mail addresses you entered do not match bookingfrontend no
E-postadressene er ikke like
Lengt of shortname is to long, max 11 characters long bookingfrontend no
Kortnavn er for langt, maks 11 tegn
+Go back to calendar bookingfrontend no Tilbake til kalender
Modified: trunk/bookingfrontend/templates/base/booking_edit_preview.xsl
===================================================================
--- trunk/bookingfrontend/templates/base/booking_edit_preview.xsl
2010-11-22 11:46:46 UTC (rev 6624)
+++ trunk/bookingfrontend/templates/base/booking_edit_preview.xsl
2010-11-22 13:18:11 UTC (rev 6625)
@@ -9,7 +9,7 @@
<xsl:choose>
<xsl:when test="step = 2">
<p>
- <xsl:value-of
select="php:function('lang', '%1 bookings will be updated.',
count(booking/results))" />
+ <xsl:value-of
select="php:function('lang', '%1 bookings will be updated.',
count(bookings/results))" />
</p>
<form action="" method="POST">
<input type="hidden"
name="repeat_until" value="{repeat_until}"/>
@@ -19,15 +19,16 @@
<input type="hidden" name="step"
value="{step}"/>
<input type="hidden" name="group_id"
value="{group_id}"/>
<input type="hidden" name="activity_id"
value="{activity_id}"/>
+ <input type="hidden" name="building_id"
value="{booking/building_id}"/>
<select size="10">
- <xsl:for-each
select="booking/results">
+ <xsl:for-each
select="bookings/results">
<option>
<xsl:attribute
name="value"><xsl:value-of select="id"/></xsl:attribute>
<xsl:value-of
select="from_"/> - <xsl:value-of select="to_"/>
</option>
</xsl:for-each>
</select>
- <xsl:if test="count(booking/results)
> 0">
+ <xsl:if test="count(bookings/results)
> 0">
<div class="form-buttons">
<input type="submit"
style="float: right;">
<xsl:attribute
name="value"><xsl:value-of select="php:function('lang',
'Update')"/></xsl:attribute>
@@ -39,7 +40,14 @@
<xsl:when test="step = 3">
<p>
<xsl:value-of
select="php:function('lang', '%1 bookings were updated.', update_count)" />
+ <div class="form-buttons">
+ <a class="cancel">
+ <xsl:attribute name="href"><xsl:value-of
select="booking/cancel_link"/></xsl:attribute>
+ <xsl:value-of select="php:function('lang', 'Go
back to calendar')" />
+ </a>
+ </div>
</p>
+
</xsl:when>
</xsl:choose>
</div>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [6625] bkbooking: bugfix,
Kjell Arne Espedal <=