Merge branch 'staging' into deployment

EotvosCollegium · Jul 13, 2024 · 655254f · 655254f
2 parents 7f26e65 + 8fa6625
commit 655254f
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 28 deletions.
diff --git a/app/Http/Controllers/Dormitory/PrintController.php b/app/Http/Controllers/Dormitory/PrintController.php
@@ -227,13 +227,11 @@ public function listPrintAccountHistory()
     {
         $this->authorize('viewAny', PrintJob::class);
 
-        $columns = ['user.name', 'balance_change', 'free_page_change', 'deadline_change', 'modifier.name', 'modified_at'];
+        $columns = ['user_name', 'balance_change', 'free_page_change', 'deadline_change', 'modifier_name', 'modified_at'];
         $paginator = TabulatorPaginator::from(
             PrintAccountHistory::join('users as user', 'user.id', '=', 'user_id')
                 ->join('users as modifier', 'modifier.id', '=', 'modified_by')
-                ->select('print_account_history.*')
-                ->with('user')
-                ->with('modifier')
+                ->select(['user.name as user_name', 'balance_change', 'free_page_change', 'deadline_change', 'modifier.name as modifier_name', 'modified_at'])
         )->sortable($columns)
             ->filterable($columns)
             ->paginate();

diff --git a/package-lock.json b/package-lock.json
diff --git a/resources/views/dormitory/print/manage/account_history.blade.php b/resources/views/dormitory/print/manage/account_history.blade.php
@@ -14,7 +14,7 @@
         columns: [
             {
                 title: "Felhasználó",
-                field: "user.name",
+                field: "user_name",
                 sorter: "string",
                 headerFilter: 'input',
                 minWidth:200
@@ -39,7 +39,7 @@
             },
             {
                 title: "Módosító",
-                field: "modifier.name",
+                field: "modifier_name",
                 sorter: "string",
                 headerFilter: 'input',
                 minWidth:180

diff --git a/resources/views/layouts/navbar.blade.php b/resources/views/layouts/navbar.blade.php
@@ -8,7 +8,7 @@
                         class="material-icons">menu</i></a>
                 <!--logo for mobile-->
                 <a class="brand-logo center hide-on-large-only"
-                   style="text-transform: uppercase;font-weight:300;letter-spacing:3px;" href="{{ url('/') }}">
+                    style="text-transform: uppercase;font-weight:300;letter-spacing:3px;" href="{{ url('/') }}">
                     {{ config('app.name', 'Urán') }} </a>
                 <!--title-->