diff --git a/app/Http/Controllers/Frontend/Admin/EventController.php b/app/Http/Controllers/Frontend/Admin/EventController.php index 28be34ae2..1cbf61f76 100644 --- a/app/Http/Controllers/Frontend/Admin/EventController.php +++ b/app/Http/Controllers/Frontend/Admin/EventController.php @@ -50,7 +50,6 @@ public function renderSuggestions(): View { return view('admin.events.suggestions', [ 'suggestions' => EventSuggestion::where('processed', false) ->where('end', '>', DB::raw('CURRENT_TIMESTAMP')) - ->where('user_id', '!=', auth()->user()->id) //moderator can't accept their own suggestions ->orderBy('begin') ->get() ]); diff --git a/composer.lock b/composer.lock index fcb09e3c5..c9cd25fb3 100644 --- a/composer.lock +++ b/composer.lock @@ -6637,16 +6637,16 @@ }, { "name": "swagger-api/swagger-ui", - "version": "v5.11.0", + "version": "v5.11.2", "source": { "type": "git", "url": "https://github.com/swagger-api/swagger-ui.git", - "reference": "ba93596058941409cfe9cc1dd59fb84e1058e72c" + "reference": "0eddc1563b387fb15bf3bb56b7916128d728554b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/swagger-api/swagger-ui/zipball/ba93596058941409cfe9cc1dd59fb84e1058e72c", - "reference": "ba93596058941409cfe9cc1dd59fb84e1058e72c", + "url": "https://api.github.com/repos/swagger-api/swagger-ui/zipball/0eddc1563b387fb15bf3bb56b7916128d728554b", + "reference": "0eddc1563b387fb15bf3bb56b7916128d728554b", "shasum": "" }, "type": "library", @@ -6692,9 +6692,9 @@ ], "support": { "issues": "https://github.com/swagger-api/swagger-ui/issues", - "source": "https://github.com/swagger-api/swagger-ui/tree/v5.11.0" + "source": "https://github.com/swagger-api/swagger-ui/tree/v5.11.2" }, - "time": "2024-01-08T12:54:37+00:00" + "time": "2024-01-29T08:56:01+00:00" }, { "name": "symfony/console", @@ -10877,16 +10877,16 @@ }, { "name": "phpunit/phpunit", - "version": "10.5.8", + "version": "10.5.9", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "08f4fa74d5fbfff1ef22abffee47aaedcaea227e" + "reference": "0bd663704f0165c9e76fe4f06ffa6a1ca727fdbe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/08f4fa74d5fbfff1ef22abffee47aaedcaea227e", - "reference": "08f4fa74d5fbfff1ef22abffee47aaedcaea227e", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/0bd663704f0165c9e76fe4f06ffa6a1ca727fdbe", + "reference": "0bd663704f0165c9e76fe4f06ffa6a1ca727fdbe", "shasum": "" }, "require": { @@ -10958,7 +10958,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.8" + "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.9" }, "funding": [ { @@ -10974,7 +10974,7 @@ "type": "tidelift" } ], - "time": "2024-01-19T07:07:27+00:00" + "time": "2024-01-22T14:35:40+00:00" }, { "name": "roave/security-advisories", @@ -10982,12 +10982,12 @@ "source": { "type": "git", "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "f81bd7cb90f5f30d3b246e342843ae905947158f" + "reference": "5e9762ed0b22ba380d8337ca46c48435c4f14cb3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/f81bd7cb90f5f30d3b246e342843ae905947158f", - "reference": "f81bd7cb90f5f30d3b246e342843ae905947158f", + "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/5e9762ed0b22ba380d8337ca46c48435c4f14cb3", + "reference": "5e9762ed0b22ba380d8337ca46c48435c4f14cb3", "shasum": "" }, "conflict": { @@ -11027,7 +11027,7 @@ "backpack/crud": "<3.4.9", "bacula-web/bacula-web": "<8.0.0.0-RC2-dev", "badaso/core": "<2.7", - "bagisto/bagisto": "<0.1.5", + "bagisto/bagisto": "<1.3.2", "barrelstrength/sprout-base-email": "<1.2.7", "barrelstrength/sprout-forms": "<3.9", "barryvdh/laravel-translation-manager": "<0.6.2", @@ -11137,7 +11137,7 @@ "ezsystems/ezplatform-solr-search-engine": ">=1.7,<1.7.12|>=2,<2.0.2|>=3.3,<3.3.15", "ezsystems/ezplatform-user": ">=1,<1.0.1", "ezsystems/ezpublish-kernel": "<6.13.8.2-dev|>=7,<7.5.31", - "ezsystems/ezpublish-legacy": "<=2017.12.7.3|>=2018.06,<=2019.03.5.1", + "ezsystems/ezpublish-legacy": "<=2017.12.7.3|>=2018.6,<=2019.03.5.1", "ezsystems/platform-ui-assets-bundle": ">=4.2,<4.2.3", "ezsystems/repository-forms": ">=2.3,<2.3.2.1-dev|>=2.5,<2.5.15", "ezyang/htmlpurifier": "<4.1.1", @@ -11386,7 +11386,7 @@ "phpxmlrpc/extras": "<0.6.1", "phpxmlrpc/phpxmlrpc": "<4.9.2", "pi/pi": "<=2.5", - "pimcore/admin-ui-classic-bundle": "<1.2.2", + "pimcore/admin-ui-classic-bundle": "<1.3.2", "pimcore/customer-management-framework-bundle": "<4.0.6", "pimcore/data-hub": "<1.2.4", "pimcore/demo": "<10.3", @@ -11410,7 +11410,7 @@ "prestashop/ps_facetedsearch": "<3.4.1", "prestashop/ps_linklist": "<3.1", "privatebin/privatebin": "<1.4", - "processwire/processwire": "<=3.0.200", + "processwire/processwire": "<=3.0.210", "propel/propel": ">=2.0.0.0-alpha1,<=2.0.0.0-alpha7", "propel/propel1": ">=1,<=1.7.1", "pterodactyl/panel": "<1.7", @@ -11451,13 +11451,13 @@ "shopxo/shopxo": "<2.2.6", "showdoc/showdoc": "<2.10.4", "silverstripe-australia/advancedreports": ">=1,<=2", - "silverstripe/admin": "<1.13.6", + "silverstripe/admin": "<1.13.19|>=2,<2.1.8", "silverstripe/assets": ">=1,<1.11.1", "silverstripe/cms": "<4.11.3", "silverstripe/comments": ">=1.3,<1.9.99|>=2,<2.9.99|>=3,<3.1.1", "silverstripe/forum": "<=0.6.1|>=0.7,<=0.7.3", - "silverstripe/framework": "<4.13.14|>=5,<5.0.13", - "silverstripe/graphql": "<3.8.2|>=4,<4.1.3|>=4.2,<4.2.5|>=4.3,<4.3.4|>=5,<5.0.3", + "silverstripe/framework": "<4.13.39|>=5,<5.1.11", + "silverstripe/graphql": "<3.8.2|>=4,<4.3.7|>=5,<5.1.3", "silverstripe/hybridsessions": ">=1,<2.4.1|>=2.5,<2.5.1", "silverstripe/recipe-cms": ">=4.5,<4.5.3", "silverstripe/registry": ">=2.1,<2.1.2|>=2.2,<2.2.1", @@ -11705,7 +11705,7 @@ "type": "tidelift" } ], - "time": "2024-01-17T21:04:22+00:00" + "time": "2024-01-29T19:03:55+00:00" }, { "name": "sebastian/cli-parser", diff --git a/resources/views/admin/events/suggestion-create.blade.php b/resources/views/admin/events/suggestion-create.blade.php index 55540d0f8..c6ed8601f 100644 --- a/resources/views/admin/events/suggestion-create.blade.php +++ b/resources/views/admin/events/suggestion-create.blade.php @@ -75,7 +75,7 @@ class="form-control" placeholder="{{ __('stationboard.station-placeholder') }}"
Es sind aktuell keine Vorschläge vorhanden. :(
+ @if($suggestions->count() === 0) ++ Nothing to do here! 🎉 +
@else{{$event->name}} | {{$event->host}} | @@ -70,5 +75,13 @@