// yet another display fix for new display header/footer

This commit is contained in:
mMarinetti committed 2011-10-28 13:51:32 +00:00
1 parent 8b225a0b63
commit 2be4b67a71
3 files changed
+8 -6

No files matched your search

+1
View File
@@ -1074,6 +1074,7 @@ class AdminControllerCore extends Controller
$this->content .= $this->initList(); $this->content .= $this->initList();
$this->content .= $this->initOptions(); $this->content .= $this->initOptions();
} }
$this->context->smarty->assign(array( $this->context->smarty->assign(array(
'table' => $this->table, 'table' => $this->table,
'current' => self::$currentIndex, 'current' => self::$currentIndex,
+5 -2
View File
@@ -147,11 +147,14 @@ abstract class ControllerCore
elseif (method_exists($this, 'displayAjax')) elseif (method_exists($this, 'displayAjax'))
$this->displayAjax(); $this->displayAjax();
} }
else
$this->display();
} }
else else
{
$this->initCursedPage(); $this->initCursedPage();
$this->display();
$this->display(); }
} }
public function displayHeader($display = true) public function displayHeader($display = true)
+2 -4
View File
@@ -391,12 +391,9 @@ class AdminHomeControllerCore extends AdminController
} }
public function displayAjax()
{
echo $this->content;
}
public function ajaxProcessGetAdminHomeElement() public function ajaxProcessGetAdminHomeElement()
{ {
$this->content_only = true;
$result = array(); $result = array();
$content = ''; $content = '';
@@ -512,6 +509,7 @@ class AdminHomeControllerCore extends AdminController
$upgrade = new Upgrader(); $upgrade = new Upgrader();
$upgrade->checkPSVersion(); $upgrade->checkPSVersion();
} }
$smarty->assign('upgrade', $upgrade); $smarty->assign('upgrade', $upgrade);
$smarty->assign('show_screencast', $this->context->employee->show_screencast); $smarty->assign('show_screencast', $this->context->employee->show_screencast);