Nemcio/Grav-Admin-Plugin
1
0
Fork 0
mirror of https://github.com/getgrav/grav-plugin-admin.git synced 2025-11-01 19:06:16 +01:00
Code Issues Packages Projects Releases Activity

Configuration: fill up the data from system configuration if user config doesn't exist

Browse Source
This commit is contained in:
Matias Griese
2014-10-06 14:38:14 +03:00
parent 9d1da6ccf3
commit 41821c57ab
7 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
classes/admin.php
View File

@@ -222,10 +222,11 @@ class Admin
case 'configuration':
case 'system':
$type = 'system';
$blueprints = $this->blueprints($type);
$file = YamlFile::instance(USER_DIR . "config/{$type}.yaml");
$obj = new Data\Data($file->content(), $blueprints);
$blueprints = $this->blueprints("config/{$type}");
$config = $this->grav['config'];
$obj = new Data\Data($config->get('system'), $blueprints);
$obj->merge($post);
$file = YamlFile::instance(USER_DIR . "config/{$type}.yaml");
$obj->file($file);
$data[$type] = $obj;
break;
@@ -233,10 +234,11 @@ class Admin
case 'settings':
case 'site':
$type = 'site';
$blueprints = $this->blueprints($type);
$file = YamlFile::instance(USER_DIR . "config/{$type}.yaml");
$obj = new Data\Data($file->content(), $blueprints);
$blueprints = $this->blueprints("config/{$type}");
$config = $this->grav['config'];
$obj = new Data\Data($config->get('site'), $blueprints);
$obj->merge($post);
$file = YamlFile::instance(USER_DIR . "config/{$type}.yaml");
$obj->file($file);
$data[$type] = $obj;
break;