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

FIX: fix invalid pingpong parent classes in few controllers

Browse Source
This commit is contained in:
Michal Kváček
2017-08-01 19:56:01 +02:00
parent 2d60010f9e
commit c2502a2355
5 changed files with 23 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Providers/AppServiceProvider.php
-2
View File
@@ -28,8 +28,6 @@ use App\CMS\Widgets\Menu\Menu;
use Barryvdh\Debugbar\ServiceProvider as DebugBarServiceProvider;
use Illuminate\Support\Facades\App;
use Illuminate\Support\ServiceProvider;
use Pingpong\Menus\MenusServiceProvider;
use Pingpong\Modules\ModulesServiceProvider;
class AppServiceProvider extends ServiceProvider
{
composer.lock
Generated
+10 -10
View File
@@ -366,12 +366,12 @@
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
"reference": "8b1b894ea25ad78d47e884bf69055c193ec02686"
"reference": "e59981477f0b710dd40708952e10f96fbf1f5361"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/8b1b894ea25ad78d47e884bf69055c193ec02686",
"reference": "8b1b894ea25ad78d47e884bf69055c193ec02686",
"url": "https://api.github.com/repos/laravel/framework/zipball/e59981477f0b710dd40708952e10f96fbf1f5361",
"reference": "e59981477f0b710dd40708952e10f96fbf1f5361",
"shasum": ""
},
"require": {
@@ -487,7 +487,7 @@
"framework",
"laravel"
],
"time": "2017-07-30T22:28:42+00:00"
"time": "2017-08-01T12:58:10+00:00"
},
{
"name": "laravelcollective/html",
@@ -1205,12 +1205,12 @@
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
"reference": "4e1a385b63faac61c56d871af1232fa68e6db2cd"
"reference": "e7f890da834c1bdd395df1f39cf3656c5f1f23fa"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/console/zipball/4e1a385b63faac61c56d871af1232fa68e6db2cd",
"reference": "4e1a385b63faac61c56d871af1232fa68e6db2cd",
"url": "https://api.github.com/repos/symfony/console/zipball/e7f890da834c1bdd395df1f39cf3656c5f1f23fa",
"reference": "e7f890da834c1bdd395df1f39cf3656c5f1f23fa",
"shasum": ""
},
"require": {
@@ -1227,14 +1227,14 @@
"symfony/config": "~3.3|~4.0",
"symfony/dependency-injection": "~3.3|~4.0",
"symfony/event-dispatcher": "~2.8|~3.0|~4.0",
"symfony/filesystem": "~2.8|~3.0|~4.0",
"symfony/http-kernel": "~2.8|~3.0|~4.0",
"symfony/lock": "~3.4|~4.0",
"symfony/process": "~3.3|~4.0"
},
"suggest": {
"psr/log": "For using the console logger",
"symfony/event-dispatcher": "",
"symfony/filesystem": "",
"symfony/lock": "",
"symfony/process": ""
},
"type": "library",
@@ -1267,7 +1267,7 @@
],
"description": "Symfony Console Component",
"homepage": "https://symfony.com",
"time": "2017-07-29T21:28:14+00:00"
"time": "2017-07-31T09:53:49+00:00"
},
{
"name": "symfony/css-selector",
config/menus.php
-6
View File
@@ -3,12 +3,6 @@
return [
'styles' => [
'navbar' => 'Pingpong\Menus\Presenters\Bootstrap\NavbarPresenter',
'navbar-right' => 'Pingpong\Menus\Presenters\Bootstrap\NavbarRightPresenter',
'nav-pills' => 'Pingpong\Menus\Presenters\Bootstrap\NavPillsPresenter',
'nav-tab' => 'Pingpong\Menus\Presenters\Bootstrap\NavTabPresenter',
'sidebar' => 'Pingpong\Menus\Presenters\Bootstrap\SidebarMenuPresenter',
'navmenu' => 'Pingpong\Menus\Presenters\Bootstrap\NavMenuPresenter',
'foundation-drilldown' => App\CMS\MenuPresenters\FoundationDrilldownMenuPresenter::class,
'foundation-dropdown' => App\CMS\MenuPresenters\FoundationDropdownMenuPresenter::class,
'foundation-dropdown-initialized' => App\CMS\MenuPresenters\FoundationInitializedDropdownMenuPresenter::class,
modules/Blog/Article/Http/Controllers/Admin/CommentsOverview.php
+1 -1
View File
@@ -1,8 +1,8 @@
<?php
namespace Modules\Blog\Article\Http\Controllers\Admin;
use App\Http\Controllers\Admin\Controller;
use Modules\Blog\Article\Entities\Comment;
use Pingpong\Modules\Routing\Controller;
class CommentsOverview extends Controller
{
modules/Blog/Article/Http/Controllers/Visitor/CreateNewComment.php
+12 -11
View File
@@ -1,17 +1,18 @@
<?php
namespace Modules\Blog\Article\Http\Controllers\Visitor;
use App\Models\Content\Content;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Event;
use Modules\Blog\Article\Entities\Article;
use Modules\Blog\Article\Entities\Comment;
use Modules\Blog\Article\Events\CreatedComment;
use Modules\Blog\Article\Handlers\Article;
use Pingpong\Modules\Routing\Controller;
use Modules\Blog\Article\Http\Requests\CreateNewComment as CreateNewCommentRequest;
class CreateNewComment extends Controller
{
public function store(\Modules\Blog\Article\Http\Requests\CreateNewComment $request, \Modules\Blog\Article\Entities\Article $article)
public function store(CreateNewCommentRequest $request, Article $article)
{
if (!isset($article->moduleSettings['allowComments']) || !$article->moduleSettings['allowComments']) {
return redirect()
@@ -30,13 +31,13 @@ class CreateNewComment extends Controller
}
$comment = Comment::create([
'user_id' => $user ? $user->id : null,
'content_id' => $article->id,
'name' => $name,
'email' => $email,
'content' => $content,
'approved' => !is_null($user)
]);
'user_id' => $user ? $user->id : null,
'content_id' => $article->id,
'name' => $name,
'email' => $email,
'content' => $content,
'approved' => !is_null($user)
]);
// fire event about new comment
Event::fire(new CreatedComment($comment));