Skip to content

Jose/fix dashboard error #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 5, 2015
Merged

Jose/fix dashboard error #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ecbb582
Move storeDependenciesInCachedRegistry() to the helper class
joseconsador May 4, 2015
4c85009
remove storeDependenciesInCachedRegistry from controller
joseconsador May 4, 2015
21d0ef2
fix bug - duplicate registry keys
joseconsador May 4, 2015
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
2 changes: 2 additions & 0 deletions src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Dashboard/Grids.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ protected function _prepareLayout() {
return parent::_prepareLayout();
}

Mage::helper('zendesk')->storeDependenciesInCachedRegistry();

//check if module is setted up
$configured = (bool) Mage::getStoreConfig('zendesk/general/domain');
$viewsIds = Mage::getStoreConfig('zendesk/backend_features/show_views') ? Mage::helper('zendesk')->getChosenViews() : array();
Expand Down
23 changes: 23 additions & 0 deletions src/app/code/community/Zendesk/Zendesk/Helper/Data.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,4 +370,27 @@ public function getConnectionStatus() {
}
}

public function storeDependenciesInCachedRegistry() {
$cache = Mage::app()->getCache();

if (null == Mage::registry('zendesk_users')) {
if( $cache->load('zendesk_users') === false) {
$users = serialize( Mage::getModel('zendesk/api_users')->all() );
$cache->save($users, 'zendesk_users', array('zendesk', 'zendesk_users'), 300);
}

$users = unserialize( $cache->load('zendesk_users') );
Mage::register('zendesk_users', $users);
}

if (null == Mage::registry('zendesk_groups')) {
if( $cache->load('zendesk_groups') === false) {
$groups = serialize( Mage::getModel('zendesk/api_groups')->all() );
$cache->save($groups, 'zendesk_groups', array('zendesk', 'zendesk_groups'), 1200);
}

$groups = unserialize( $cache->load('zendesk_groups') );
Mage::register('zendesk_groups', $groups);
}
}
}
28 changes: 4 additions & 24 deletions src/app/code/community/Zendesk/Zendesk/controllers/Adminhtml/ZendeskController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ public function indexAction()
$this->_redirect('adminhtml/dashboard');
return;
}
$this->storeDependenciesInCachedRegistry();

Mage::helper('zendesk')->storeDependenciesInCachedRegistry();

$this->_title($this->__('Zendesk Dashboard'));
$this->loadLayout();
Expand Down Expand Up @@ -629,7 +629,7 @@ public function ticketsAllAction() {
$isAjax = Mage::app()->getRequest()->isAjax();

if ($isAjax) {
$this->storeDependenciesInCachedRegistry();
Mage::helper('zendesk')->storeDependenciesInCachedRegistry();
$this->getResponse()->setBody($this->getLayout()->createBlock('zendesk/adminhtml_dashboard_tab_tickets_grid_all')->toHtml());
}
}
Expand All @@ -638,34 +638,14 @@ public function ticketsViewAction() {
$isAjax = Mage::app()->getRequest()->isAjax();

if ($isAjax) {
$this->storeDependenciesInCachedRegistry();
Mage::helper('zendesk')->storeDependenciesInCachedRegistry();
$viewId = (int) $this->getRequest()->getParam('viewid');
Mage::register('zendesk_tickets_view', $viewId);

$this->getResponse()->setBody($this->getLayout()->createBlock('zendesk/adminhtml_dashboard_tab_tickets_grid_view')->toHtml());
}
}

protected function storeDependenciesInCachedRegistry() {
$cache = Mage::app()->getCache();

if( $cache->load('zendesk_users') === false) {
$users = serialize( Mage::getModel('zendesk/api_users')->all() );
$cache->save($users, 'zendesk_users', array('zendesk', 'zendesk_users'), 300);
}

if( $cache->load('zendesk_groups') === false) {
$groups = serialize( Mage::getModel('zendesk/api_groups')->all() );
$cache->save($groups, 'zendesk_groups', array('zendesk', 'zendesk_groups'), 1200);
}

$users = unserialize( $cache->load('zendesk_users') );
$groups = unserialize( $cache->load('zendesk_groups') );

Mage::register('zendesk_users', $users);
Mage::register('zendesk_groups', $groups);
}

protected function getMassActionResponse($response, $ids, $message = '%d out of %d ticket(s) were updated.')
{
if (isset($response['job_status']) && isset($response['job_status']['url'])) {
Expand Down