Merge branch '114_dev' into 12_dev
This commit is contained in:
commit
928f43bfe7
|
@ -31,6 +31,16 @@ class JsonDb extends \Prowebcraft\Dot
|
||||||
parent::__construct();
|
parent::__construct();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Reload data from file
|
||||||
|
* @return $this
|
||||||
|
*/
|
||||||
|
public function reload()
|
||||||
|
{
|
||||||
|
$this->loadData(true);
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Set value or array of values to path
|
* Set value or array of values to path
|
||||||
*
|
*
|
||||||
|
|
|
@ -501,6 +501,10 @@ class page extends common {
|
||||||
|
|
||||||
// Met à jour le site map
|
// Met à jour le site map
|
||||||
$this->createSitemap('all');
|
$this->createSitemap('all');
|
||||||
|
|
||||||
|
// Mise à jour de la liste des pages pour TinyMCE
|
||||||
|
$this->pages2Json();
|
||||||
|
|
||||||
// Redirection vers la configuration
|
// Redirection vers la configuration
|
||||||
if(
|
if(
|
||||||
$this->getInput('pageEditModuleRedirect', helper::FILTER_BOOLEAN)
|
$this->getInput('pageEditModuleRedirect', helper::FILTER_BOOLEAN)
|
||||||
|
@ -534,8 +538,6 @@ class page extends common {
|
||||||
self::$pagesBarId[$parentPageId] = $this->getData(['page', $parentPageId, 'title']);
|
self::$pagesBarId[$parentPageId] = $this->getData(['page', $parentPageId, 'title']);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Mise à jour de la liste des pages pour TinyMCE
|
|
||||||
$this->pages2Json();
|
|
||||||
// Valeurs en sortie
|
// Valeurs en sortie
|
||||||
$this->addOutput([
|
$this->addOutput([
|
||||||
'title' => $this->getData(['page', $this->getUrl(2), 'title']),
|
'title' => $this->getData(['page', $this->getUrl(2), 'title']),
|
||||||
|
|
Loading…
Reference in New Issue