Moved plugins in admin to new GPM

This commit is contained in:
Djamil Legato
2014-10-02 12:14:13 -07:00
parent bf78a52a2b
commit d6d6eba3a7
2 changed files with 42 additions and 18 deletions

View File

@@ -9,6 +9,7 @@ use Grav\Common\Uri;
use Grav\Common\Page\Pages;
use Grav\Common\Page\Page;
use Grav\Common\Data;
use Grav\Common\GPM\Local\Packages as LocalPackages;
use RocketTheme\Toolbox\File\File;
use RocketTheme\Toolbox\File\LogFile;
use RocketTheme\Toolbox\File\YamlFile;
@@ -63,6 +64,11 @@ class Admin
*/
public $user;
/**
* @var Packages
*/
public $localPackages;
/**
* Constructor.
@@ -282,9 +288,15 @@ class Admin
*/
public function themes()
{
if (!$this->localPackages) {
$this->localPackages = new LocalPackages();
}
return $this->localPackages['themes']->toArray();
/** @var Themes $themes */
$themes = $this->grav['themes'];
return $themes->all();
/*$themes = $this->grav['themes'];
return $themes->all();*/
}
/**
@@ -306,9 +318,15 @@ class Admin
*/
public function plugins()
{
if (!$this->localPackages) {
$this->localPackages = new LocalPackages();
}
return $this->localPackages['plugins'];
/** @var Plugins $plugins */
$plugins = $this->grav['plugins'];
return $plugins->all();
/*$plugins = $this->grav['plugins'];
return $plugins->all();*/
}
/**
@@ -335,7 +353,7 @@ class Admin
* @param integer $count number of pages to pull back
* @return array
*/
public function latestPages($count=10)
public function latestPages($count = 10)
{
/** @var Pages $pages */
$pages = $this->grav['pages'];
@@ -348,7 +366,7 @@ class Admin
}
// sort based on modified
uasort($latest, function($a, $b) {
uasort($latest, function ($a, $b) {
if ($a['modified'] == $b['modified']) {
return 0;
}
@@ -437,5 +455,4 @@ class Admin
{
return dirname('/' . Grav::instance()['admin']->route);
}
}