diff --git a/app/Http/Livewire/News/ArticleOverview.php b/app/Http/Livewire/News/ArticleOverview.php index 19ed44ae..d26fd320 100644 --- a/app/Http/Livewire/News/ArticleOverview.php +++ b/app/Http/Livewire/News/ArticleOverview.php @@ -33,19 +33,7 @@ class ArticleOverview extends Component 'tags', ]) ->where('type', 'markdown_article') - ->when(app()->environment('production'), - function ($query) { - if (auth()->user() && auth() - ->user() - ->hasRole('news-editor')) { - return; - } - $query - ->whereHas('createdBy.roles', - fn($query) => $query->where('roles.name', 'news-editor')) - ->where('approved', true); - } - ) + ->where('news', true) ->orderByDesc('created_at') ->get(), ])->layout('layouts.app', [ diff --git a/database/migrations/2023_02_11_151546_add_news_flag_to_library_items_table.php b/database/migrations/2023_02_11_151546_add_news_flag_to_library_items_table.php new file mode 100644 index 00000000..c42381ea --- /dev/null +++ b/database/migrations/2023_02_11_151546_add_news_flag_to_library_items_table.php @@ -0,0 +1,30 @@ +boolean('news') + ->default(false); + }); + } + + /** + * Reverse the migrations. + * @return void + */ + public function down() + { + Schema::table('library_items', function (Blueprint $table) { + // + }); + } +}; diff --git a/resources/views/livewire/news/article-overview.blade.php b/resources/views/livewire/news/article-overview.blade.php index 33e17de7..05710a1e 100644 --- a/resources/views/livewire/news/article-overview.blade.php +++ b/resources/views/livewire/news/article-overview.blade.php @@ -23,82 +23,84 @@
-
{{ $libraryItem->name }}
-{{ strip_tags($libraryItem->excerpt) }}
+ @if($libraryItem->approved || $libraryItem->created_by === auth()->id() || auth()->user()?->hasRole('news-editor')) +{{ $libraryItem->name }}
+{{ strip_tags($libraryItem->excerpt) }}
+-