Jingga/oms-News
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-News.git synced 2026-02-17 17:08:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Restructure

Browse Source
This commit is contained in:
Dennis Eichhorn 2015-12-31 18:05:19 +01:00
parent e2e99eab5a
commit b17e25c56e
10 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Admin/Activate.php
View File

@ -15,7 +15,7 @@
*/ */
namespace Modules\News\Admin; namespace Modules\News\Admin;
use phpOMS\DataStorage\Database\DatabaseType;
use phpOMS\DataStorage\Database\Pool; use phpOMS\DataStorage\Database\Pool;
use phpOMS\Module\ActivateAbstract; use phpOMS\Module\ActivateAbstract;

2
Admin/Deactivate.php
View File

@ -15,7 +15,7 @@
*/ */
namespace Modules\News\Admin; namespace Modules\News\Admin;
use phpOMS\DataStorage\Database\DatabaseType;
use phpOMS\DataStorage\Database\Pool; use phpOMS\DataStorage\Database\Pool;
use phpOMS\Module\DeactivateAbstract; use phpOMS\Module\DeactivateAbstract;

2
Admin/Install/Navigation.php
View File

@ -14,6 +14,7 @@
* @link http://orange-management.com * @link http://orange-management.com
*/ */
namespace Modules\News\Admin\Install; namespace Modules\News\Admin\Install;
use phpOMS\DataStorage\Database\Pool;
/** /**
* Navigation class. * Navigation class.
@ -33,6 +34,7 @@ class Navigation
$navData = json_decode(file_get_contents(__DIR__ . '/Navigation.install.json'), true); $navData = json_decode(file_get_contents(__DIR__ . '/Navigation.install.json'), true);
$class = '\\Modules\\Navigation\\Admin\\Installer'; $class = '\\Modules\\Navigation\\Admin\\Installer';
/** @var $class \Modules\Navigation\Admin\Installer */
$class::installExternal($dbPool, $navData); $class::installExternal($dbPool, $navData);
} }
} }

2
Admin/Uninstall.php
View File

@ -15,7 +15,7 @@
*/ */
namespace Modules\News\Admin; namespace Modules\News\Admin;
use phpOMS\DataStorage\Database\DatabaseType;
use phpOMS\DataStorage\Database\Pool; use phpOMS\DataStorage\Database\Pool;
use phpOMS\Module\UninstallAbstract; use phpOMS\Module\UninstallAbstract;

5
Admin/Update.php
View File

@ -15,9 +15,10 @@
*/ */
namespace Modules\News\Admin; namespace Modules\News\Admin;
use phpOMS\DataStorage\Database\DatabaseType;
use phpOMS\DataStorage\Database\Pool; use phpOMS\DataStorage\Database\Pool;
use phpOMS\Module\UpdateAbstract; use phpOMS\Module\UpdateAbstract;
use phpOMS\System\FileSystem;
/** /**
* Navigation class. * Navigation class.
@ -38,6 +39,8 @@ class Update extends UpdateAbstract
*/ */
public static function update(Pool $dbPool, array $info) public static function update(Pool $dbPool, array $info)
{ {
FileSystem::deletePath(__DIR__ . '/Update');
mkdir('Update');
parent::update($dbPool, $info); parent::update($dbPool, $info);
} }
} }

18
Controller.php
View File

@ -65,7 +65,7 @@ class Controller extends ModuleAbstract implements WebInterface
* @var \string * @var \string
* @since 1.0.0 * @since 1.0.0
*/ */
protected static $module = 'News'; const MODULE_NAME = 'News';
/** /**
* Localization files. * Localization files.
@ -74,7 +74,7 @@ class Controller extends ModuleAbstract implements WebInterface
* @since 1.0.0 * @since 1.0.0
*/ */
protected static $localization = [ protected static $localization = [
RequestDestination::BACKEND => ['backend'], RequestDestination::BACKEND => [''],
]; ];
/** /**
@ -83,9 +83,7 @@ class Controller extends ModuleAbstract implements WebInterface
* @var \string * @var \string
* @since 1.0.0 * @since 1.0.0
*/ */
protected static $providing = [ protected static $providing = [];
'Content',
];
/** /**
* Dependencies. * Dependencies.
@ -121,7 +119,7 @@ class Controller extends ModuleAbstract implements WebInterface
public function viewNewsDashboard(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface public function viewNewsDashboard(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
{ {
$view = new View($this->app, $request, $response); $view = new View($this->app, $request, $response);
$view->setTemplate('/Modules/News/Theme/backend/news-dashboard'); $view->setTemplate('/Modules/News/Theme/Backend/news-dashboard');
$view->addData('nav', $this->createNavigation(1000701001, $request, $response)); $view->addData('nav', $this->createNavigation(1000701001, $request, $response));
$news = $this->getNewsListR(20, 0, 'news.news_publish', 'DESC', $this->app->accountManager->get($request->getAccount())); $news = $this->getNewsListR(20, 0, 'news.news_publish', 'DESC', $this->app->accountManager->get($request->getAccount()));
@ -145,7 +143,7 @@ class Controller extends ModuleAbstract implements WebInterface
public function viewNewsArticle(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface public function viewNewsArticle(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
{ {
$view = new View($this->app, $request, $response); $view = new View($this->app, $request, $response);
$view->setTemplate('/Modules/News/Theme/backend/news-single'); $view->setTemplate('/Modules/News/Theme/Backend/news-single');
$view->addData('nav', $this->createNavigation(1000701001, $request, $response)); $view->addData('nav', $this->createNavigation(1000701001, $request, $response));
$newsArticleMapper = new NewsArticleMapper($this->app->dbPool->get()); $newsArticleMapper = new NewsArticleMapper($this->app->dbPool->get());
@ -168,7 +166,7 @@ class Controller extends ModuleAbstract implements WebInterface
public function viewNewsArchive(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface public function viewNewsArchive(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
{ {
$view = new View($this->app, $request, $response); $view = new View($this->app, $request, $response);
$view->setTemplate('/Modules/News/Theme/backend/news-archive'); $view->setTemplate('/Modules/News/Theme/Backend/news-archive');
$view->addData('nav', $this->createNavigation(1000701001, $request, $response)); $view->addData('nav', $this->createNavigation(1000701001, $request, $response));
return $view; return $view;
@ -187,7 +185,7 @@ class Controller extends ModuleAbstract implements WebInterface
public function viewNewsCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface public function viewNewsCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
{ {
$view = new View($this->app, $request, $response); $view = new View($this->app, $request, $response);
$view->setTemplate('/Modules/News/Theme/backend/news-create'); $view->setTemplate('/Modules/News/Theme/Backend/news-create');
$view->addData('nav', $this->createNavigation(1000701001, $request, $response)); $view->addData('nav', $this->createNavigation(1000701001, $request, $response));
return $view; return $view;
@ -290,7 +288,7 @@ class Controller extends ModuleAbstract implements WebInterface
{ {
$nav = Navigation::getInstance($request, $this->app->dbPool); $nav = Navigation::getInstance($request, $this->app->dbPool);
$navView = new NavigationView($this->app, $request, $response); $navView = new NavigationView($this->app, $request, $response);
$navView->setTemplate('/Modules/Navigation/Theme/backend/mid'); $navView->setTemplate('/Modules/Navigation/Theme/Backend/mid');
$navView->setNav($nav->getNav()); $navView->setNav($nav->getNav());
$navView->setLanguage($request->getL11n()->language); $navView->setLanguage($request->getL11n()->language);
$navView->setParent($pageId); $navView->setParent($pageId);

2
Models/NewsArticleMapper.php
View File

@ -67,7 +67,7 @@ class NewsArticleMapper extends DataMapperAbstract
* @since 1.0.0 * @since 1.0.0
* @author Dennis Eichhorn <d.eichhorn@oms.com> * @author Dennis Eichhorn <d.eichhorn@oms.com>
*/ */
public function create(&$obj) public function create($obj)
{ {
try { try {
$objId = parent::create($obj); $objId = parent::create($obj);

0
Theme/lang/nav.backend.en.lang.php → Theme/backend/Lang/Navigation.en.lang.php
View File

0
Theme/lang/backend.en.lang.php → Theme/backend/Lang/en.lang.php
View File

4
info.json
View File

@ -37,7 +37,7 @@
"type": 5, "type": 5,
"from": "News", "from": "News",
"for": "Navigation", "for": "Navigation",
"file": "nav.backend" "file": "Navigation"
}, },
{ {
"pid": [ "pid": [
@ -45,7 +45,7 @@
], ],
"type": 5, "type": 5,
"for": "Content", "for": "Content",
"file": "backend", "file": "",
"from": "News" "from": "News"
} }
] ]