yolinlin/aowow
1
0
Fork 0
mirror of https://github.com/Sarjuuk/aowow.git synced 2025-11-29 15:58:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

removing smarty - part XII

Browse Source 
- readded quest/quests, zones
- delayed filter-evaluation, also linked filterObj to page to be applied to cacheKey
- added check for modulo calculation with floats (fixes "0 years" - duarions)
Quests:
 * added category-locales
 * creating objectives shouldn't be quite as intensive anymore
This commit is contained in:
Sarjuuk
2014-07-03 21:49:09 +02:00
parent e0f4e9403a
commit 727d450923
25 changed files with 1735 additions and 1291 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pages/objects.php
View File

@@ -20,6 +20,7 @@ class ObjectsPage extends GenericPage
public function __construct($pageCall, $pageParam)
{
$this->filterObj = new GameObjectListFilter();
$this->getCategoryFromUrl($pageParam);;
parent::__construct();
@@ -35,18 +36,16 @@ class ObjectsPage extends GenericPage
if ($this->category)
$conditions[] = ['typeCat', (int)$this->category[0]];
$objectFilter = new GameObjectListFilter();
// recreate form selection
$this->filter = $objectFilter->getForm('form');
$this->filter = $this->filterObj->getForm('form');
$this->filter['query'] = isset($_GET['filter']) ? $_GET['filter'] : null;
$this->filter['fi'] = $objectFilter->getForm();
$this->filter['fi'] = $this->filterObj->getForm();
if ($_ = $objectFilter->getConditions())
if ($_ = $this->filterObj->getConditions())
$conditions[] = $_;
$params = $data = [];
$objects = new GameObjectList($conditions, ['extraOpts' => $objectFilter->extraOpts]);
$objects = new GameObjectList($conditions, ['extraOpts' => $this->filterObj->extraOpts]);
if (!$objects->error)
{
$data = $objects->getListviewData();
@@ -61,9 +60,8 @@ class ObjectsPage extends GenericPage
$params['_truncated'] = 1;
}
if ($objectFilter->error)
if ($this->filterObj->error)
$params['_errors'] = '$1';
}
$this->lvData = array(