[Fmsystem-commits] [15269] booking: delete booking

[sigurdne]

Revision: 15269
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15269
Author:   sigurdne
Date:     2016-06-08 12:58:17 +0000 (Wed, 08 Jun 2016)
Log Message:
-----------
booking: delete booking

Modified Paths:
--------------
    trunk/booking/inc/class.uibooking.inc.php
    trunk/booking/templates/base/booking_delete_preview.xsl

Modified: trunk/booking/inc/class.uibooking.inc.php
===================================================================
--- trunk/booking/inc/class.uibooking.inc.php   2016-06-08 12:15:05 UTC (rev 
15268)
+++ trunk/booking/inc/class.uibooking.inc.php   2016-06-08 12:58:17 UTC (rev 
15269)
@@ -89,6 +89,7 @@
                                ),
                                'datatable' => array(
                                        'source' => 
self::link(array('menuaction' => 'booking.uibooking.index', 'phpgw_return_as' 
=> 'json')),
+                                       'sorted_by' => array('key' => 4, 'dir' 
=> 'desc'),//id
                                        'field' => array(
                                                array(
                                                        'key' => 
'activity_name',
@@ -896,13 +897,13 @@
                                                }
                                                if ($_POST['delete_allocation'] 
== 'on')
                                                {
-                                                       if (!$aid)
+//                                                     if (!$aid)
+//                                                     {
+//                                                             
$allocation_keep[$i]['from_'] = $fromdate;
+//                                                             
$allocation_keep[$i]['to_'] = $todate;
+//                                                     }
+//                                                     else
                                                        {
-                                                               
$allocation_keep[$i]['from_'] = $fromdate;
-                                                               
$allocation_keep[$i]['to_'] = $todate;
-                                                       }
-                                                       else
-                                                       {
                                                                
$allocation_delete[$i]['from_'] = $fromdate;
                                                                
$allocation_delete[$i]['to_'] = $todate;
                                                                if ($step == 3)

Modified: trunk/booking/templates/base/booking_delete_preview.xsl
===================================================================
--- trunk/booking/templates/base/booking_delete_preview.xsl     2016-06-08 
12:15:05 UTC (rev 15268)
+++ trunk/booking/templates/base/booking_delete_preview.xsl     2016-06-08 
12:58:17 UTC (rev 15269)
@@ -67,6 +67,7 @@
                                                        </li>
                                                </xsl:for-each>
                                        </div>
+               <!--
                                        <h4>
                                                <xsl:value-of 
select="php:function('lang', 'Allocations with still existing bookings (%1)', 
count(allocation_keep[from_]))" />
                                        </h4>
@@ -77,6 +78,7 @@
                                                        </li>
                                                </xsl:for-each>
                                        </div>
+               -->
                                </xsl:if>
                                <div class="form-buttons">
                                        <input type="submit" name="delete" 
class="pure-button pure-button-primary">