[Fmsystem-commits] [15043] Syncromind: Merge 14936:15027 from trunk

[sigurdne]

Revision: 15043
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15043
Author:   sigurdne
Date:     2016-05-13 12:04:54 +0000 (Fri, 13 May 2016)
Log Message:
-----------
Syncromind: Merge 14936:15027 from trunk

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

Modified: branches/dev-syncromind-2/booking/inc/class.uiapplication.inc.php
===================================================================
--- branches/dev-syncromind-2/booking/inc/class.uiapplication.inc.php   
2016-05-13 12:04:52 UTC (rev 15042)
+++ branches/dev-syncromind-2/booking/inc/class.uiapplication.inc.php   
2016-05-13 12:04:54 UTC (rev 15043)
@@ -311,7 +311,7 @@
                                'datatable' => array(
                                        'source' => 
self::link(array('menuaction' => 'booking.uiapplication.index',
                                                'phpgw_return_as' => 'json')),
-                                       'sorted_by' => array('key' => 4, 'dir' 
=> 'asc'),//created
+                                       'sorted_by' => array('key' => 0, 'dir' 
=> 'desc'),//id
                                        'field' => array(
                                                array(
                                                        'key' => 'id',
@@ -805,6 +805,9 @@
 
                public function edit()
                {
+                       $config = CreateObject('phpgwapi.config', 'booking');
+                       $config->read();
+                       $application_text = $config->config_data;
                        $id = phpgw::get_var('id', 'int');
                        $application = $this->bo->read_single($id);
                        $activity_path = 
$this->activity_bo->get_path($application['activity_id']);
@@ -898,9 +901,10 @@
 
                        
phpgwapi_jquery::formvalidator_generate(array('location', 'date', 'security',
                                'file'), 'application_form');
-
+                       //_debug_array($application_text);die();
                        self::render_template_xsl('application_edit', 
array('application' => $application,
-                               'activities' => $activities, 'agegroups' => 
$agegroups, 'audience' => $audience));
+                               'activities' => $activities, 'agegroups' => 
$agegroups, 'audience' => $audience,
+                               'config' => $application_text));
                }
 
                private function check_date_availability( &$allocation )