Version 4.3.0
This commit is contained in:
1 parent
96997ddd8e
commit
fe1acf984a
1349 files changed
+116159
-67711
No files matched your search
@@ -160,7 +160,7 @@ class _Stream extends \IPS\Patterns\ActiveRecord
|
||||
public static function customer( \IPS\nexus\Customer $customer )
|
||||
{
|
||||
$return = new static;
|
||||
$return->title = \IPS\Member::loggedIn()->language()->addToStack( 'members_support_requests', FALSE, array( 'sprintf' => array( $customer->cm_name ) ) );
|
||||
$return->title = sprintf( \IPS\Member::loggedIn()->language()->get( 'members_support_requests' ), $customer->cm_name );
|
||||
$return->departments = NULL;
|
||||
$return->statuses = NULL;
|
||||
$return->severities = NULL;
|
||||
@@ -406,7 +406,8 @@ class _Stream extends \IPS\Patterns\ActiveRecord
|
||||
/* Search term */
|
||||
if ( $this->search_term )
|
||||
{
|
||||
$where[] = array( 'r_id IN(?)', \IPS\Db::i()->select( 'reply_request', 'nexus_support_replies', array( "MATCH(reply_post) AGAINST (? IN BOOLEAN MODE)", $this->search_term ) ) );
|
||||
$subQuery= \IPS\Content\Search\Mysql\Query::matchClause('reply_post', $this->search_term);
|
||||
$where[] = array( 'r_id IN(?)', \IPS\Db::i()->select( 'reply_request', 'nexus_support_replies', $subQuery ) );
|
||||
}
|
||||
|
||||
/* Tracked? */
|
||||
@@ -451,15 +452,8 @@ class _Stream extends \IPS\Patterns\ActiveRecord
|
||||
|
||||
if ( mb_strpos( $order, 'dpt_position' ) !== FALSE )
|
||||
{
|
||||
try
|
||||
{
|
||||
\IPS\Db::i()->select( 'staff_id', 'nexus_support_staff_dpt_order', array( 'staff_id=?', $member->member_id ), NULL, 1 )->first();
|
||||
$query->join( 'nexus_support_staff_dpt_order', 'nexus_support_staff_dpt_order.department_id=r_department AND nexus_support_staff_dpt_order.staff_id=' . $member->member_id );
|
||||
}
|
||||
catch ( \UnderflowException $e )
|
||||
{
|
||||
$query->join( 'nexus_support_departments', 'dpt_id=r_department' );
|
||||
}
|
||||
$query->join( 'nexus_support_staff_dpt_order', 'nexus_support_staff_dpt_order.department_id=r_department AND nexus_support_staff_dpt_order.staff_id=' . $member->member_id );
|
||||
$query->join( 'nexus_support_departments', 'dpt_id=r_department' );
|
||||
}
|
||||
if ( mb_strpos( $order, 'sev_position' ) !== FALSE )
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user