Other fixes

This commit is contained in:
Dimo Belov 2018-07-10 11:37:56 +03:00
parent 65b95fb93f
commit b290209a41
2 changed files with 12 additions and 3 deletions

View File

@ -44,6 +44,10 @@ class dbList extends dbJSON
return $list; return $list;
} }
if (count($list) < $amountOfItems) {
return $list;
}
// The first page number is 1, so the real is 0 // The first page number is 1, so the real is 0
$realPageNumber = $pageNumber - 1; $realPageNumber = $pageNumber - 1;
$chunks = array_chunk($list, $realPageNumber); $chunks = array_chunk($list, $realPageNumber);
@ -94,9 +98,11 @@ class dbList extends dbJSON
// $args => 'name', 'oldkey', 'newKey', 'template' // $args => 'name', 'oldkey', 'newKey', 'template'
public function edit($args) public function edit($args)
{ {
if (isset($this->db[$args['newKey']])) {
if (isset($this->db[$args['newKey']])) {
Log::set(__METHOD__.LOG_SEP.'The new key already exists. Key: '.$args['newKey']); Log::set(__METHOD__.LOG_SEP.'The new key already exists. Key: '.$args['newKey']);
return false; //this not allow to edit existing category
//return false;
} }
$this->db[$args['newKey']]['name'] = $args['name']; $this->db[$args['newKey']]['name'] = $args['name'];

View File

@ -10,7 +10,10 @@ class Category {
if (isset($dbCategories->db[$key])) { if (isset($dbCategories->db[$key])) {
$this->vars['name'] = $dbCategories->db[$key]['name']; $this->vars['name'] = $dbCategories->db[$key]['name'];
$this->vars['template'] = $dbCategories->db[$key]['template']; //here i recieve error from old category structure where template is not exist.
if(isset($dbCategories->db[$key]['template'])){
$this->vars['template'] = $dbCategories->db[$key]['template'];
}
$this->vars['key'] = $key; $this->vars['key'] = $key;
$this->vars['permalink'] = DOMAIN_CATEGORIES . $key; $this->vars['permalink'] = DOMAIN_CATEGORIES . $key;
$this->vars['list'] = $dbCategories->db[$key]['list']; $this->vars['list'] = $dbCategories->db[$key]['list'];