[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [16695] more on eventplanner
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [16695] more on eventplanner |
|
Date: |
Fri, 5 May 2017 05:09:50 -0400 (EDT) |
Revision: 16695
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16695
Author: sigurdne
Date: 2017-05-05 05:09:50 -0400 (Fri, 05 May 2017)
Log Message:
-----------
more on eventplanner
Modified Paths:
--------------
trunk/eventplanner/inc/class.uibooking.inc.php
trunk/eventplanner/inc/model/class.application.inc.php
trunk/eventplanner/inc/model/class.booking.inc.php
trunk/phpgwapi/inc/class.socommon.inc.php
Modified: trunk/eventplanner/inc/class.uibooking.inc.php
===================================================================
--- trunk/eventplanner/inc/class.uibooking.inc.php 2017-05-05 04:47:17 UTC
(rev 16694)
+++ trunk/eventplanner/inc/class.uibooking.inc.php 2017-05-05 09:09:50 UTC
(rev 16695)
@@ -82,17 +82,17 @@
'form' => array(
'toolbar' => array(
'item' => array(
+// array(
+// 'type' =>
'autocomplete',
+// 'name' =>
'application',
+// 'app' =>
$this->currentapp,
+// 'ui' =>
'application',
+// 'function' =>
'get_list',
+// 'label_attr' =>
'title',
+// 'text' =>
lang('application') . ':',
+//
'requestGenerator' => 'requestWithApplicationFilter'
+// ),
array(
- 'type' =>
'autocomplete',
- 'name' =>
'application',
- 'app' =>
$this->currentapp,
- 'ui' =>
'application',
- 'function' =>
'get_list',
- 'label_attr' =>
'title',
- 'text' =>
lang('application') . ':',
-
'requestGenerator' => 'requestWithApplicationFilter'
- ),
- array(
'type' =>
'checkbox',
'name' =>
'filter_active',
'text' =>
lang('showall'),
Modified: trunk/eventplanner/inc/model/class.application.inc.php
===================================================================
--- trunk/eventplanner/inc/model/class.application.inc.php 2017-05-05
04:47:17 UTC (rev 16694)
+++ trunk/eventplanner/inc/model/class.application.inc.php 2017-05-05
09:09:50 UTC (rev 16695)
@@ -131,6 +131,7 @@
'label' => 'id',
'sortable'=> true,
'formatter' =>
'JqueryPortico.formatLink',
+ 'public' => true,
),
'display_in_dashboard' => array('action'=>
PHPGW_ACL_ADD | PHPGW_ACL_EDIT,
'type' => 'bool'),
@@ -172,6 +173,7 @@
'label' => 'title',
'sortable' => false,
'query' => true,
+ 'public' => true,
),
'description' => array('action'=> PHPGW_ACL_ADD
| PHPGW_ACL_EDIT,
'type' => 'string',
Modified: trunk/eventplanner/inc/model/class.booking.inc.php
===================================================================
--- trunk/eventplanner/inc/model/class.booking.inc.php 2017-05-05 04:47:17 UTC
(rev 16694)
+++ trunk/eventplanner/inc/model/class.booking.inc.php 2017-05-05 09:09:50 UTC
(rev 16695)
@@ -108,7 +108,7 @@
),
'from_' => array('action' => PHPGW_ACL_READ,
'type' => 'string',
- 'query' => true,
+ 'query' => false,
'label' => 'from',
'public' => true,
'join' => array(
@@ -120,7 +120,7 @@
),
'to_' => array('action' => PHPGW_ACL_READ,
'type' => 'string',
- 'query' => true,
+ 'query' => false,
'label' => 'to',
'public' => true,
'join' => array(
@@ -132,7 +132,7 @@
),
'active' => array('action' => PHPGW_ACL_READ,
'type' => 'string',
- 'query' => true,
+ 'query' => false,
'label' => 'active',
'public' => true,
'join' => array(
Modified: trunk/phpgwapi/inc/class.socommon.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.socommon.inc.php 2017-05-05 04:47:17 UTC (rev
16694)
+++ trunk/phpgwapi/inc/class.socommon.inc.php 2017-05-05 09:09:50 UTC (rev
16695)
@@ -501,7 +501,16 @@
if ($params['query'])
{
$table = $params['join'] ?
$this->build_join_table_alias($field, $params) : $this->table_name;
- $column = $params['join'] ?
$params['join']['column'] : $field;
+
+ if
(isset($params['multiple_join']) && $params['multiple_join'])
+ {
+ $table_column =
$params['multiple_join']['column'];
+ }
+ else
+ {
+ $column =
$params['join'] ? $params['join']['column'] : $field;
+ $table_column =
"{$table}.{$column}";
+ }
if ($params['type'] == 'int')
{
if (!(int)$query)
@@ -508,11 +517,11 @@
{
continue;
}
- $like_clauses[] =
"{$table}.{$column} = " . (int)$query;//$this->db->db_addslashes($query);
+ $like_clauses[] =
"{$table_column} = " . (int)$query;//$this->db->db_addslashes($query);
}
else
{
- $like_clauses[] =
"{$table}.{$column} $this->like $like_pattern";
+ $like_clauses[] =
"{$table_column} $this->like $like_pattern";
}
}
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [16695] more on eventplanner,
sigurdne <=