[Fmsystem-commits] [14199]

[Nelson Guerra]

Revision: 14199
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14199
Author:   nelson224
Date:     2015-10-17 00:21:02 +0000 (Sat, 17 Oct 2015)
Log Message:
-----------


Modified Paths:
--------------
    branches/dev-syncromind/booking/inc/class.uicompleted_reservation.inc.php

Modified: 
branches/dev-syncromind/booking/inc/class.uicompleted_reservation.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uicompleted_reservation.inc.php   
2015-10-17 00:20:45 UTC (rev 14198)
+++ branches/dev-syncromind/booking/inc/class.uicompleted_reservation.inc.php   
2015-10-17 00:21:02 UTC (rev 14199)
@@ -683,12 +683,16 @@
                        {
                                $show_edit_button = true;
                        }
-                        
-                        $tabs = array();
-                        $tabs['generic'] = array('label' => lang('Group'), 
'link' => '#completed_reservation');
-                        $active_tab = 'generic';
+                       
+                       $reservation['from_'] = 
pretty_timestamp($reservation['from_']);
+                       $reservation['to_'] = 
pretty_timestamp($reservation['to_']);
+                       $reservation['cancel_link'] = 
self::link(array('menuaction' => 'booking.uicompleted_reservation.index'));
+                       
+                       $tabs = array();
+                       $tabs['completed_reservation'] = array('label' => 
lang('Reservation show'), 'link' => '#completed_reservation');
+                       $active_tab = 'completed_reservation';
 
-                        $reservation['tabs'] = 
phpgwapi_jquery::tabview_generate($tabs, $active_tab);
+                       $reservation['tabs'] = 
phpgwapi_jquery::tabview_generate($tabs, $active_tab);
                        self::render_template('completed_reservation', 
array('reservation' => $reservation, 'show_edit_button' => $show_edit_button));
                }
                
@@ -726,7 +730,7 @@
                }
                
                public function edit()
-                {
+        {
                        //TODO: Display hint to user about primary type of 
customer identifier
                        
                        $building_role = 
$this->bo->accessable_buildings($GLOBALS['phpgw_info']['user']['id']);
@@ -758,10 +762,10 @@
                                }
                        }
                        
-                        $tabs = array();
-                        $tabs['generic'] = array('label' => lang('Group'), 
'link' => '#completed_reservation_edit');
-                        $active_tab = 'generic';
-                        $reservation['tabs'] = 
phpgwapi_jquery::tabview_generate($tabs, $active_tab);
+                       $tabs = array();
+                       $tabs['completed_reservation_edit'] = array('label' => 
lang('Reservation edit'), 'link' => '#completed_reservation_edit');
+                       $active_tab = 'completed_reservation_edit';
+                       $reservation['tabs'] = 
phpgwapi_jquery::tabview_generate($tabs, $active_tab);
                         
                        $this->add_default_display_data($reservation);
                        $this->flash_form_errors($errors);