minicms/core
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev' into binarity.cz

Browse Source
This commit is contained in:
Michal Kváček
2016-10-04 11:16:59 +02:00
parent fdb63fcd8a f699d2c569
commit 3f1ae0f5a1
3 changed files with 81 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/Blog/Article/Entities/Comment.php
+2 -1
View File
@@ -11,7 +11,8 @@ class Comment extends Model
'content_id', 'content_id',
'content', 'content',
'email', 'email',
'name' 'name',
'approved'
]; ];
public function author() public function author()
modules/Blog/Article/Http/Controllers/Visitor/CreateNewComment.php
+2 -1
View File
@@ -40,7 +40,8 @@ class CreateNewComment extends Controller
'content_id' => $article->id, 'content_id' => $article->id,
'name' => $name, 'name' => $name,
'email' => $email, 'email' => $email,
'content' => $content 'content' => $content,
'approved' => !is_null($user)
]); ]);
// fire event about new comment // fire event about new comment
modules/Blog/ArticleList/Providers/ArticleListServiceProvider.php
+77 -78
View File
@@ -1,92 +1,91 @@
<?php namespace Modules\Blog\ArticleList\Providers; <?php namespace Modules\Blog\ArticleList\Providers;
use App\Handlers\Registrators\TemplateRegistrator;
use Illuminate\Support\ServiceProvider; use Illuminate\Support\ServiceProvider;
use InvalidArgumentException;
use Modules\Blog\ArticleList\Handlers\ArticleList;
class ArticleListServiceProvider extends ServiceProvider { class ArticleListServiceProvider extends ServiceProvider
{
/**
* Indicates if loading of the provider is deferred.
*
* @var bool
*/
protected $defer = false;
/** /**
* Indicates if loading of the provider is deferred. * Boot the application events.
* *
* @var bool * @return void
*/ */
protected $defer = false; public function boot()
{
$this->registerTranslations();
$this->registerConfig();
$this->registerViews();
}
/** /**
* Boot the application events. * Register the service provider.
* *
* @return void * @return void
*/ */
public function boot() public function register()
{ {
$this->registerTranslations(); }
$this->registerConfig();
$this->registerViews();
}
/** /**
* Register the service provider. * Register config.
* *
* @return void * @return void
*/ */
public function register() protected function registerConfig()
{ {
} $this->publishes([__DIR__ . '/../Config/config.php' => config_path('articlelist.php')]);
$this->mergeConfigFrom(__DIR__ . '/../Config/config.php', 'articlelist');
}
/** /**
* Register config. * Register views.
* *
* @return void * @return void
*/ */
protected function registerConfig() public function registerViews()
{ {
$this->publishes([__DIR__.'/../Config/config.php' => config_path('articlelist.php')]); $viewPath = base_path('resources/views/modules/articlelist');
$this->mergeConfigFrom(__DIR__.'/../Config/config.php', 'articlelist'); $sourcePath = __DIR__ . '/../Resources/views';
} if (!is_dir($sourcePath)) {
return;
}
/** $this->publishes([$sourcePath => $viewPath]);
* Register views.
*
* @return void
*/
public function registerViews()
{
$viewPath = base_path('resources/views/modules/articlelist');
$sourcePath = __DIR__.'/../Resources/views';
$this->publishes([$sourcePath => $viewPath]); $this->loadViewsFrom(array_merge(array_map(function ($path) {
return $path . '/modules/articlelist';
}, \Config::get('view.paths')), [$sourcePath]), 'articlelist');
}
$this->loadViewsFrom(array_merge(array_map(function ($path) { /**
return $path . '/modules/articlelist'; * Register translations.
}, \Config::get('view.paths')), [$sourcePath]), 'articlelist'); *
} * @return void
*/
public function registerTranslations()
{
$langPath = base_path('resources/lang/modules/articlelist');
/** if (is_dir($langPath)) {
* Register translations. $this->loadTranslationsFrom($langPath, 'articlelist');
* } else {
* @return void $this->loadTranslationsFrom(__DIR__ . '/../Resources/lang', 'articlelist');
*/ }
public function registerTranslations() }
{
$langPath = base_path('resources/lang/modules/articlelist');
if (is_dir($langPath)) {
$this->loadTranslationsFrom($langPath, 'articlelist');
} else {
$this->loadTranslationsFrom(__DIR__ .'/../Resources/lang', 'articlelist');
}
}
/**
* Get the services provided by the provider.
*
* @return array
*/
public function provides()
{
return array();
}
/**
* Get the services provided by the provider.
*
* @return array
*/
public function provides()
{
return array ();
}
} }