Author: nathangray
New Revision: 55386
URL: http://svn.stylite.de/viewvc/egroupware?rev=55386&view=rev
Log:
Enable customfield searching in tracker
Modified:
trunk/tracker/inc/class.tracker_so.inc.php
trunk/tracker/inc/class.tracker_ui.inc.php
— trunk/tracker/inc/class.tracker_so.inc.php (original)
+++ trunk/tracker/inc/class.tracker_so.inc.php Mon Mar 14 23:46:52 2016
@@ -69,6 +69,11 @@
// Set columns to search here so self::TRACKER_TABLE is available
$this->columns_to_search = array(self::TRACKER_TABLE.’.tr_id’,‘tr_summary’,‘tr_description’,‘tr_budget’,‘reply_message’);
parent::__construct(‘tracker’,self::TRACKER_TABLE,self::EXTRA_TABLE,’’,‘tr_extra_name’,‘tr_extra_value’,‘tr_id’);
+
-
if ($this->customfields) // add custom fields, if configured
-
{
-
$this->columns_to_search[] = self::EXTRA_TABLE.'.tr_extra_value';
-
}
}
/**
@@ -502,7 +507,7 @@
// if we have a join (searching by extra_value also adds a join), we have to group be tr_id, to avoid getting rows multiple times
if (($join || isset($criteria[$this->extra_value])) && stristr($order_by,‘GROUP BY’) === false) // group by tr_id, as we get one row per assignee!
{
-
$order_by = ' GROUP BY '.self::TRACKER_TABLE.'.tr_id, '.self::TRACKER_TABLE.'. tr_summary, '.self::TRACKER_TABLE.'.tr_tracker, '.self::TRACKER_TABLE.'.cat_id, '.self::TRACKER_TABLE.'.tr_version, '.self::TRACKER_TABLE.'. tr_status , '.self::TRACKER_TABLE.'. tr_description, '.self::TRACKER_TABLE.'.tr_private, '.self::TRACKER_TABLE.'.tr_budget, '.self::TRACKER_TABLE.'.tr_completion, '.self::TRACKER_TABLE.'.tr_creator , '.self::TRACKER_TABLE.'.tr_created, '.self::TRACKER_TABLE.'. tr_modifier, '.self::TRACKER_TABLE.'.tr_modified, '.self::TRACKER_TABLE.'.tr_startdate, '.self::TRACKER_TABLE.'.tr_duedate, '.self::TRACKER_TABLE.'.tr_closed, '.self::TRACKER_TABLE.'. tr_priority, '.self::TRACKER_TABLE.'. tr_resolution, '.self::TRACKER_TABLE.'. tr_cc, '.self::TRACKER_TABLE.'.tr_group, '.self::TRACKER_TABLE.'. tr_edit_mode, '.self::TRACKER_TABLE.'. tr_seen ORDER BY '.($order_by ? $order_by : 'bounties DESC');
-
$order_by = ' GROUP BY '.self::TRACKER_TABLE.'.tr_id, '.self::TRACKER_TABLE.'.tr_summary, '.self::TRACKER_TABLE.'.tr_tracker, '.self::TRACKER_TABLE.'.cat_id, '.self::TRACKER_TABLE.'.tr_version, '.self::TRACKER_TABLE.'.tr_status , '.self::TRACKER_TABLE.'.tr_description, '.self::TRACKER_TABLE.'.tr_private, '.self::TRACKER_TABLE.'.tr_budget, '.self::TRACKER_TABLE.'.tr_completion, '.self::TRACKER_TABLE.'.tr_creator , '.self::TRACKER_TABLE.'.tr_created, '.self::TRACKER_TABLE.'. tr_modifier, '.self::TRACKER_TABLE.'.tr_modified, '.self::TRACKER_TABLE.'.tr_startdate, '.self::TRACKER_TABLE.'.tr_duedate, '.self::TRACKER_TABLE.'.tr_closed, '.self::TRACKER_TABLE.'.tr_priority, '.self::TRACKER_TABLE.'.tr_resolution, '.self::TRACKER_TABLE.'.tr_cc, '.self::TRACKER_TABLE.'.tr_group, '.self::TRACKER_TABLE.'.tr_edit_mode, '.self::TRACKER_TABLE.'.tr_seen ORDER BY '.($order_by ? $order_by : 'bounties DESC');
}
$rows =& parent::search($criteria,$only_keys,$order_by,$extra_cols,$wildcard,$empty,$op,$start,$filter,$join);
— trunk/tracker/inc/class.tracker_ui.inc.php (original)
+++ trunk/tracker/inc/class.tracker_ui.inc.php Mon Mar 14 23:46:52 2016
@@ -868,7 +868,7 @@
if (empty($query['col_filter']['tr_tracker']))
{
Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785231&iu=/4140
eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs
