[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [15003] 2
From: |
sigurdne |
Subject: |
[Fmsystem-commits] [15003] 2 |
Date: |
Thu, 12 May 2016 19:56:42 +0000 (UTC) |
Revision: 15003
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15003
Author: sigurdne
Date: 2016-05-12 19:56:42 +0000 (Thu, 12 May 2016)
Log Message:
-----------
2
Modified Paths:
--------------
trunk/booking/inc/class.uiapplication.inc.php
Modified: trunk/booking/inc/class.uiapplication.inc.php
===================================================================
--- trunk/booking/inc/class.uiapplication.inc.php 2016-05-12 19:56:22 UTC
(rev 15002)
+++ trunk/booking/inc/class.uiapplication.inc.php 2016-05-12 19:56:42 UTC
(rev 15003)
@@ -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 )
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [15003] 2,
sigurdne <=