tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-30 17:24:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix mixedPagination property typo, Statusloader libraries missing and getter for Abstractquery

Browse Source 
refs #4178
This commit is contained in:
Jannis Moßhammer 2013-07-19 17:48:24 +02:00
parent 5e4adcfea2
commit dac9b7be4b
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/views/scripts/mixedPagination.phtml
View File

@ -23,7 +23,7 @@ $title_next = sprintf(
<ul> <ul>
<!-- Previous page link --> <!-- Previous page link -->
<?php if (isset($this->previous)): ?> <?php if (isset($this->previous)): ?>
<li><a href="<?= $this->url()->setParam('page', $this->previous) ?>" title="<?= $titleprev ?>">« <?= $this->translate('Back') ?></a></li> <li><a href="<?= $this->url()->setParam('page', $this->previous) ?>" title="<?= $title_prev ?>">« <?= $this->translate('Back') ?></a></li>
<?php else: ?> <?php else: ?>
<li class="disabled"><span>« <?= $this->translate('Back') ?></span></li> <li class="disabled"><span>« <?= $this->translate('Back') ?></span></li>
<?php endif ?> <?php endif ?>

6
library/Icinga/Data/AbstractQuery.php
View File

@ -164,6 +164,7 @@ abstract class AbstractQuery
$dir = self::SORT_ASC; $dir = self::SORT_ASC;
} }
} }
$this->order_columns[] = array($col, $dir); $this->order_columns[] = array($col, $dir);
return $this; return $this;
} }
@ -374,6 +375,11 @@ abstract class AbstractQuery
return $paginator; return $paginator;
} }
public function getColumns()
{
return $this->columns;
}
/** /**
* Destructor. Remove $ds, just to be on the safe side * Destructor. Remove $ds, just to be on the safe side
*/ */

12
test/php/library/Icinga/Protocol/Statusdat/StatusdatTestLoader.php
View File

@ -9,16 +9,18 @@ class StatusdatTestLoader extends LibraryLoader
public static function requireLibrary() public static function requireLibrary()
{ {
$libPath = LibraryLoader::getLibraryPath(); $libPath = LibraryLoader::getLibraryPath();
require_once($libPath."/Data/AbstractQuery.php");
require_once($libPath."/Data/DatasourceInterface.php");
$statusdat = realpath($libPath."/Protocol/Statusdat/");
require_once 'Zend/Config.php'; require_once 'Zend/Config.php';
require_once 'Zend/Cache.php'; require_once 'Zend/Cache.php';
require_once 'Zend/Log.php';
require_once($libPath."/Data/AbstractQuery.php");
require_once($libPath."/Application/Logger.php");
require_once($statusdat."/View/AbstractAccessorStrategy.php"); require_once($libPath."/Data/DatasourceInterface.php");
$statusdat = realpath($libPath."/Protocol/Statusdat/");
require_once($statusdat."/View/AccessorStrategy.php");
require_once($statusdat."/View/MonitoringObjectList.php"); require_once($statusdat."/View/MonitoringObjectList.php");
require_once($statusdat."/View/ObjectRemappingView.php"); require_once($statusdat."/View/ObjectRemappingView.php");
require_once($statusdat."/ObjectContainer.php");
require_once($statusdat."/IReader.php"); require_once($statusdat."/IReader.php");
require_once($statusdat."/RuntimeStateContainer.php"); require_once($statusdat."/RuntimeStateContainer.php");
require_once($statusdat."/Query.php"); require_once($statusdat."/Query.php");