Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,6 @@ protected function addColumnBasedOnType($index, $title, $filter = false, $sortab
'filter' => $filter,
'index' => $index,
'type' => $this->getColumnType($index),
'users' => $this->getCollection()->users,
);

$renderer = $this->getColumnRenderer($index);
Expand Down Expand Up @@ -242,18 +241,4 @@ public function getGridJavascript()

return $js;
}

/**
* Override the parent method so that $this->_prepareCollection() is called first
*
* @return $this
*/
protected function _prepareGrid()
{
$this->_prepareCollection();
$this->_prepareColumns();
$this->_prepareMassactionBlock();

return $this;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,8 @@ protected function _prepareColumns() {
$this->addColumn('requester_id', array(
'header' => Mage::helper('zendesk')->__('Email'),
'width' => '60',
'renderer' => 'zendesk/adminhtml_dashboard_tab_tickets_grid_renderer_email',
'index' => 'requester_id',
'index' => 'requester_email',
'sortable' => false,
'users' => $this->getCollection()->users,
));

$this->addColumn('type', array(
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
class Zendesk_Zendesk_Block_Adminhtml_Dashboard_Tab_Tickets_Grid_Renderer_User extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract {

public function render(Varien_Object $row) {
$users = $this->getColumn()->users;
$users = $row->users;
$value = (int) $row->getData($this->getColumn()->getIndex());

$found = array_filter($users, function($user) use($value) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,15 +123,19 @@ public function getCollection(array $params = array()) {

$all = Mage::getModel('zendesk/api_tickets')->search($params);

// Set the users for this collection
$this->users = $all['users'];

$emails = array_column($this->users, 'email', 'id');

foreach ($all['results'] as $ticket) {
$ticket['requester_email'] = (isset($emails[$ticket['requester_id']]) ? $emails[$ticket['requester_id']] : '');

$obj = new Varien_Object();
$obj->setData($ticket);
$this->addItem($obj);
}

// Set the users for this collection
$this->users = $all['users'];

$this->setPageSize($params['per_page']);
$this->setCurPage($params['page']);
$this->setOrder($params['sort_by'], $params['sort_order']);
Expand All @@ -146,9 +150,13 @@ public function getCollection(array $params = array()) {
public function getCollectionFromView($viewId, array $params = array()) {
$view = Mage::getModel('zendesk/api_views')->execute($viewId, $params);

// Set the users for this collection
$this->users = (isset($view['users'])) ? $view['users'] : array();

if (is_array($view['rows'])) {
foreach ($view['rows'] as $row) {
$ticket = array_merge($row, $row['ticket']);
$ticket['users'] = $this->users;

$this->appendParamsWithoutIdPostfix($ticket, array('requester', 'assignee', 'group'));

Expand All @@ -158,9 +166,6 @@ public function getCollectionFromView($viewId, array $params = array()) {
}
}

// Set the users for this collection
$this->users = (isset($view['users'])) ? $view['users'] : array();

$this->_viewColumns = $view['columns'] ? $view['columns'] : array();

$this->setPageSize($params['per_page']);
Expand Down
116 changes: 116 additions & 0 deletions src/app/code/community/Zendesk/Zendesk/functions.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
<?php

if (!function_exists('array_column')) {
/**
* This file is part of the array_column library
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*
* @copyright Copyright (c) Ben Ramsey (http://benramsey.com)
* @license http://opensource.org/licenses/MIT MIT
*/

/**
* Returns the values from a single column of the input array, identified by
* the $columnKey.
*
* Optionally, you may provide an $indexKey to index the values in the returned
* array by the values from the $indexKey column in the input array.
*
* @param array $input A multi-dimensional array (record set) from which to pull
* a column of values.
* @param mixed $columnKey The column of values to return. This value may be the
* integer key of the column you wish to retrieve, or it
* may be the string key name for an associative array.
* @param mixed $indexKey (Optional.) The column to use as the index/keys for
* the returned array. This value may be the integer key
* of the column, or it may be the string key name.
* @return array
*/
function array_column($input = null, $columnKey = null, $indexKey = null)
{
// Using func_get_args() in order to check for proper number of
// parameters and trigger errors exactly as the built-in array_column()
// does in PHP 5.5.
$argc = func_num_args();
$params = func_get_args();

if ($argc < 2) {
trigger_error("array_column() expects at least 2 parameters, {$argc} given", E_USER_WARNING);
return null;
}

if (!is_array($params[0])) {
trigger_error(
'array_column() expects parameter 1 to be array, ' . gettype($params[0]) . ' given',
E_USER_WARNING
);
return null;
}

if (!is_int($params[1])
&& !is_float($params[1])
&& !is_string($params[1])
&& $params[1] !== null
&& !(is_object($params[1]) && method_exists($params[1], '__toString'))
) {
trigger_error('array_column(): The column key should be either a string or an integer', E_USER_WARNING);
return false;
}

if (isset($params[2])
&& !is_int($params[2])
&& !is_float($params[2])
&& !is_string($params[2])
&& !(is_object($params[2]) && method_exists($params[2], '__toString'))
) {
trigger_error('array_column(): The index key should be either a string or an integer', E_USER_WARNING);
return false;
}

$paramsInput = $params[0];
$paramsColumnKey = ($params[1] !== null) ? (string) $params[1] : null;

$paramsIndexKey = null;
if (isset($params[2])) {
if (is_float($params[2]) || is_int($params[2])) {
$paramsIndexKey = (int) $params[2];
} else {
$paramsIndexKey = (string) $params[2];
}
}

$resultArray = array();

foreach ($paramsInput as $row) {
$key = $value = null;
$keySet = $valueSet = false;

if ($paramsIndexKey !== null && array_key_exists($paramsIndexKey, $row)) {
$keySet = true;
$key = (string) $row[$paramsIndexKey];
}

if ($paramsColumnKey === null) {
$valueSet = true;
$value = $row;
} elseif (is_array($row) && array_key_exists($paramsColumnKey, $row)) {
$valueSet = true;
$value = $row[$paramsColumnKey];
}

if ($valueSet) {
if ($keySet) {
$resultArray[$key] = $value;
} else {
$resultArray[] = $value;
}
}

}

return $resultArray;
}

}