[Fmsystem-commits] [15351] fix delete referenced records

[sigurdne]

Revision: 15351
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15351
Author:   sigurdne
Date:     2016-07-01 08:12:13 +0000 (Fri, 01 Jul 2016)
Log Message:
-----------
fix delete referenced records

Modified Paths:
--------------
    trunk/booking/inc/class.sobooking.inc.php
    trunk/booking/inc/class.uibooking.inc.php
    trunk/helpdesk/setup/setup.inc.php

Modified: trunk/booking/inc/class.sobooking.inc.php
===================================================================
--- trunk/booking/inc/class.sobooking.inc.php   2016-06-30 19:55:29 UTC (rev 
15350)
+++ trunk/booking/inc/class.sobooking.inc.php   2016-07-01 08:12:13 UTC (rev 
15351)
@@ -435,6 +435,9 @@
                {
                        $db = $this->db;
                        $db->transaction_begin();
+                       $table_name = $this->table_name . '_cost';
+                       $sql = "DELETE FROM $table_name WHERE booking_id = 
($id)";
+                       $db->query($sql, __LINE__, __FILE__);
                        $table_name = $this->table_name . '_resource';
                        $sql = "DELETE FROM $table_name WHERE booking_id = 
($id)";
                        $db->query($sql, __LINE__, __FILE__);

Modified: trunk/booking/inc/class.uibooking.inc.php
===================================================================
--- trunk/booking/inc/class.uibooking.inc.php   2016-06-30 19:55:29 UTC (rev 
15350)
+++ trunk/booking/inc/class.uibooking.inc.php   2016-07-01 08:12:13 UTC (rev 
15351)
@@ -918,7 +918,8 @@
                                        }
                                        if ($step == 3)
                                        {
-                                               
$this->redirect(array('menuaction' => 'booking.uimassbooking.schedule', 'id' => 
$allocation['building_id']));
+                                               $building_id = 
$booking['building_id'] ? $booking['building_id'] : $allocation['building_id'];
+                                               
$this->redirect(array('menuaction' => 'booking.uimassbooking.schedule', 'id' => 
$building_id));
                                        }
                                }
                        }

Modified: trunk/helpdesk/setup/setup.inc.php
===================================================================
--- trunk/helpdesk/setup/setup.inc.php  2016-06-30 19:55:29 UTC (rev 15350)
+++ trunk/helpdesk/setup/setup.inc.php  2016-07-01 08:12:13 UTC (rev 15351)
@@ -61,12 +61,6 @@
                'cat_edit'              => 'helpdesk.cat_hooks.cat_edit',
                'config',
                'home',
-               'addaccount'    => 'helpdesk.hook_helper.clear_userlist',
-               'editaccount'   => 'helpdesk.hook_helper.clear_userlist',
-               'deleteaccount' => 'helpdesk.hook_helper.clear_userlist',
-               'addgroup'              => 
'helpdesk.hook_helper.clear_userlist',
-               'deletegroup'   => 'helpdesk.hook_helper.clear_userlist',
-               'editgroup'             => 'helpdesk.hook_helper.clear_userlist'
        );
 
        /* Dependencies for this app to work */