Skip to content
Snippets Groups Projects
Commit 4f1f09e5 authored by Jared Hancock's avatar Jared Hancock
Browse files

dashboard: Fix missing Raphael on PJAX load

parent c57ab6ae
No related branches found
No related tags found
No related merge requests found
...@@ -113,7 +113,7 @@ class StaffNav { ...@@ -113,7 +113,7 @@ class StaffNav {
function getTabs(){ function getTabs(){
if(!$this->tabs) { if(!$this->tabs) {
$this->tabs=array(); $this->tabs=array();
$this->tabs['dashboard'] = array('desc'=>__('Dashboard'),'href'=>'dashboard.php','title'=>__('Agent Dashboard')); $this->tabs['dashboard'] = array('desc'=>__('Dashboard'),'href'=>'dashboard.php','title'=>__('Agent Dashboard'), "class"=>"no-pjax");
$this->tabs['users'] = array('desc' => __('Users'), 'href' => 'users.php', 'title' => __('User Directory')); $this->tabs['users'] = array('desc' => __('Users'), 'href' => 'users.php', 'title' => __('User Directory'));
$this->tabs['tickets'] = array('desc'=>__('Tickets'),'href'=>'tickets.php','title'=>__('Ticket Queue')); $this->tabs['tickets'] = array('desc'=>__('Tickets'),'href'=>'tickets.php','title'=>__('Ticket Queue'));
$this->tabs['kbase'] = array('desc'=>__('Knowledgebase'),'href'=>'kb.php','title'=>__('Knowledgebase')); $this->tabs['kbase'] = array('desc'=>__('Knowledgebase'),'href'=>'kb.php','title'=>__('Knowledgebase'));
......
<?php <?php
if(($tabs=$nav->getTabs()) && is_array($tabs)){ if(($tabs=$nav->getTabs()) && is_array($tabs)){
foreach($tabs as $name =>$tab) { foreach($tabs as $name =>$tab) {
echo sprintf('<li class="%s"><a href="%s">%s</a>',$tab['active']?'active':'inactive',$tab['href'],$tab['desc']); echo sprintf('<li class="%s %s"><a href="%s">%s</a>',
$tab['active'] ? 'active':'inactive',
@$tab['class'] ?: '',
$tab['href'],$tab['desc']);
if(!$tab['active'] && ($subnav=$nav->getSubMenu($name))){ if(!$tab['active'] && ($subnav=$nav->getSubMenu($name))){
echo "<ul>\n"; echo "<ul>\n";
foreach($subnav as $k => $item) { foreach($subnav as $k => $item) {
......
(function ($) { (function ($) {
var current_tab; var current_tab = null;
function refresh(e) { function refresh(e) {
$('#line-chart-here').empty(); $('#line-chart-here').empty();
$('#line-chart-legend').empty(); $('#line-chart-legend').empty();
...@@ -135,6 +135,9 @@ ...@@ -135,6 +135,9 @@
stop = this.period.value || 'now'; stop = this.period.value || 'now';
} }
if (!current_tab)
current_tab = $('#tabular-navigation li:first-child a');
var group = current_tab.attr('table-group'); var group = current_tab.attr('table-group');
var pagesize = 25; var pagesize = 25;
getConfig().then(function(c) { if (c.page_size) pagesize = c.page_size; }); getConfig().then(function(c) { if (c.page_size) pagesize = c.page_size; });
...@@ -262,10 +265,11 @@ ...@@ -262,10 +265,11 @@
}); });
return false; return false;
} }
$(function() { $(function() {
$('#timeframe-form').submit(refresh); var form = $('#timeframe-form');
form.submit(refresh);
//Trigger submit now...init. //Trigger submit now...init.
$('#timeframe-form').submit(); form.submit();
}); });
})(window.jQuery); })(window.jQuery);
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment