Webumenia 1923 remove pagination on admin collection/articles

CHANGELOG.md

@@ -8,14 +8,17 @@ All notable changes to this project will be documented in this file[^1].
 - RedirectLegacyCatalogRequest middleware for handling "legacy" catalog requests in new catalog
 - 'hidden' catalog fields to V1 API filterables
 
+### Changed
+- add soft deletes to articles
+
 ## [2.79.0] - 2023-08-31
 ### Added
 - images:generate-ratios command
 
 ### Changed
 - behaviour for /api/v1/items/aggregations so that facet doesn't filter itself
 - display published date on collection index
-- add soft deletes to articles
+- remove pagination from collections and articles in admin
 
 ## [2.78.0] - 2023-07-21
 ### Added

app/Http/Controllers/ArticleController.php

@@ -9,15 +9,14 @@
 
 class ArticleController extends Controller
 {
-
     /**
      * Display a listing of the resource.
      *
      * @return Response
      */
     public function index()
     {
-        $articles = Article::orderBy('created_at', 'desc')->paginate(20);
+        $articles = Article::orderBy('created_at', 'desc')->get();
         return view('articles.index')->with('articles', $articles);
     }
 
@@ -40,13 +39,15 @@ public function store(Request $request)
     {
         $request->validate(Article::getValidationRules());
 
-        $article = new Article;
+        $article = new Article();
 
         // store translatable attributes
         foreach (\Config::get('translatable.locales') as $i => $locale) {
-            if (hasTranslationValue($locale, $article->translatedAttributes)){
+            if (hasTranslationValue($locale, $article->translatedAttributes)) {
                 foreach ($article->translatedAttributes as $attribute) {
-                    $article->translateOrNew($locale)->$attribute = $request->input($locale . '.' . $attribute);
+                    $article->translateOrNew($locale)->$attribute = $request->input(
+                        $locale . '.' . $attribute
+                    );
                 }
             }
         }
@@ -69,7 +70,7 @@ public function store(Request $request)
         if ($request->has('title_shadow')) {
             $article->title_shadow = $request->input('title_shadow');
         }
-        
+
         $article->save();
 
         if ($request->hasFile('main_image')) {
@@ -105,10 +106,10 @@ public function edit($id)
             return Redirect::route('article.index');
         }
 
-        return view('articles.form', array_merge(
-            $this->buildSelectOptions(),
-            ['article' => $article]
-        ));
+        return view(
+            'articles.form',
+            array_merge($this->buildSelectOptions(), ['article' => $article])
+        );
     }
 
     /**
@@ -123,9 +124,11 @@ public function update(Article $article, Request $request)
 
         // update translatable attributes
         foreach (\Config::get('translatable.locales') as $i => $locale) {
-            if (hasTranslationValue($locale, $article->translatedAttributes)){
+            if (hasTranslationValue($locale, $article->translatedAttributes)) {
                 foreach ($article->translatedAttributes as $attribute) {
-                    $article->translateOrNew($locale)->$attribute = $request->input($locale . '.' . $attribute);
+                    $article->translateOrNew($locale)->$attribute = $request->input(
+                        $locale . '.' . $attribute
+                    );
                 }
             }
         }
@@ -166,10 +169,9 @@ public function update(Article $article, Request $request)
     public function destroy($id)
     {
         Article::find($id)->delete();
-        return Redirect::route('article.index')->with('message', 'Článok bol zmazaný');;
+        return Redirect::route('article.index')->with('message', 'Článok bol zmazaný');
     }
 
-
     private function uploadMainImage($article, $request)
     {
         $main_image = $request->file('main_image');
@@ -180,26 +182,31 @@ private function uploadMainImage($article, $request)
     private function buildSelectOptions()
     {
         return [
-            'eduMediaTypesOptions' => collect(Article::$eduMediaTypes)
-                ->reduce(function ($options, $value) {
-                    $options[$value] = trans("edu.media_type.$value");
-                    return $options;
-                 }),
-            'eduAgeGroupsOptions' => collect(Article::$eduAgeGroups)
-                ->reduce(function ($options, $value) {
-                    $options[$value] = trans("edu.age_group.$value");
-                    return $options;
-                 }),
-            'eduKeywordsOptions' => Article::all()
-                ->pluck('edu_keywords')
-                ->filter()
-                ->flatten()
-                ->unique()
-                ->sort()
-                ->reduce(function ($options, $value) {
-                    $options[$value] = $value;
-                    return $options;
-                 }) ?? collect(),
+            'eduMediaTypesOptions' => collect(Article::$eduMediaTypes)->reduce(function (
+                $options,
+                $value
+            ) {
+                $options[$value] = trans("edu.media_type.$value");
+                return $options;
+            }),
+            'eduAgeGroupsOptions' => collect(Article::$eduAgeGroups)->reduce(function (
+                $options,
+                $value
+            ) {
+                $options[$value] = trans("edu.age_group.$value");
+                return $options;
+            }),
+            'eduKeywordsOptions' =>
+                Article::all()
+                    ->pluck('edu_keywords')
+                    ->filter()
+                    ->flatten()
+                    ->unique()
+                    ->sort()
+                    ->reduce(function ($options, $value) {
+                        $options[$value] = $value;
+                        return $options;
+                    }) ?? collect(),
         ];
     }
 }

app/Http/Controllers/CollectionController.php

@@ -24,9 +24,14 @@ class CollectionController extends Controller
     public function index()
     {
         if (Gate::allows('administer')) {
-            $collections = Collection::orderBy('created_at', 'desc')->with(['user'])->paginate(20);
+            $collections = Collection::orderBy('created_at', 'desc')
+                ->with(['user'])
+                ->get();
         } else {
-            $collections = Collection::where('user_id', '=', Auth::user()->id)->orderBy('published_at', 'desc')->with(['user'])->paginate(20);
+            $collections = Collection::where('user_id', '=', Auth::user()->id)
+                ->orderBy('published_at', 'desc')
+                ->with(['user'])
+                ->get();
         }
 
         return view('collections.index')->with('collections', $collections);
@@ -59,9 +64,11 @@ public function store()
 
             // store translatable attributes
             foreach (\Config::get('translatable.locales') as $i => $locale) {
-                if (hasTranslationValue($locale, $collection->translatedAttributes)){
+                if (hasTranslationValue($locale, $collection->translatedAttributes)) {
                     foreach ($collection->translatedAttributes as $attribute) {
-                        $collection->translateOrNew($locale)->$attribute = Request::input($locale . '.' . $attribute);
+                        $collection->translateOrNew($locale)->$attribute = Request::input(
+                            $locale . '.' . $attribute
+                        );
                     }
                 }
             }
@@ -89,7 +96,9 @@ public function store()
             return Redirect::route('collection.index');
         }
 
-        return Redirect::back()->withInput()->withErrors($v);
+        return Redirect::back()
+            ->withInput()
+            ->withErrors($v);
     }
 
     /**
@@ -136,14 +145,16 @@ public function update($id)
         $v = Validator::make(Request::all(), Collection::$rules);
 
         if ($v->passes()) {
-            $input = Arr::except(Request::all(), array('_method'));
+            $input = Arr::except(Request::all(), ['_method']);
 
             $collection = Collection::find($id);
 
             foreach (\Config::get('translatable.locales') as $i => $locale) {
-                if (hasTranslationValue($locale, $collection->translatedAttributes)){
+                if (hasTranslationValue($locale, $collection->translatedAttributes)) {
                     foreach ($collection->translatedAttributes as $attribute) {
-                        $collection->translateOrNew($locale)->$attribute = Request::input($locale . '.' . $attribute);
+                        $collection->translateOrNew($locale)->$attribute = Request::input(
+                            $locale . '.' . $attribute
+                        );
                     }
                 }
             }
@@ -166,7 +177,10 @@ public function update($id)
                 $this->uploadMainImage($collection);
             }
 
-            Session::flash('message', 'Kolekcia <code>' . $collection->name . '</code> bola upravená');
+            Session::flash(
+                'message',
+                'Kolekcia <code>' . $collection->name . '</code> bola upravená'
+            );
 
             return Redirect::route('collection.index');
         }
@@ -208,7 +222,9 @@ public function fill()
                 }
             }
 
-            return Redirect::back()->withMessage('Do kolekcie ' . $collection->name . ' bolo pridaných ' . count($items) . ' diel');
+            return Redirect::back()->withMessage(
+                'Do kolekcie ' . $collection->name . ' bolo pridaných ' . count($items) . ' diel'
+            );
         } else {
             return Redirect::back()->withMessage('Chyba: zvolená kolekcia nebola nájdená. ');
         }
@@ -219,7 +235,13 @@ public function detach($collection_id, $item_id)
         $collection = Collection::find($collection_id);
         $collection->items()->detach($item_id);
 
-        return Redirect::back()->withMessage('Z kolekcie <strong>' . $collection->name . '</strong> bolo odstrádené dielo <code>' . $item_id . '</code>');
+        return Redirect::back()->withMessage(
+            'Z kolekcie <strong>' .
+                $collection->name .
+                '</strong> bolo odstrádené dielo <code>' .
+                $item_id .
+                '</code>'
+        );
     }
 
     private function uploadMainImage($collection)

resources/views/articles/index.blade.php

@@ -76,10 +76,6 @@ class="btn btn-success btn-xs btn-outline"
                             @endforeach
                         </tbody>
                     </table>
-
-                    <div class="text-center"><?php echo $articles->render(); ?></div>
-
-
                 </div>
                 <!-- /.panel-body -->
             </div>