From 051dfcc2926b1c7a675f8d1ff8dac5045d10ef7b Mon Sep 17 00:00:00 2001
From: csavelief <csavelief@mncc.fr>
Date: Sun, 2 Jun 2024 20:56:59 +0200
Subject: [PATCH] Code review on commit b8fde4ef

---
 app/Models/YnhBackup.php                      |  2 +-
 .../home/cards/_towerify_backups.blade.php    | 28 +++++++------------
 .../home/cards/_towerify_domains.blade.php    |  2 +-
 3 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/app/Models/YnhBackup.php b/app/Models/YnhBackup.php
index ab5d3f4..a4170fd 100644
--- a/app/Models/YnhBackup.php
+++ b/app/Models/YnhBackup.php
@@ -33,6 +33,6 @@ public function user(): BelongsTo
 
     public function server(): BelongsTo
     {
-        return $this->belongsTo(YnhServer::class);
+        return $this->belongsTo(YnhServer::class, 'ynh_server_id', 'id');
     }
 }
diff --git a/resources/views/home/cards/_towerify_backups.blade.php b/resources/views/home/cards/_towerify_backups.blade.php
index 84db5c6..5ac65e8 100644
--- a/resources/views/home/cards/_towerify_backups.blade.php
+++ b/resources/views/home/cards/_towerify_backups.blade.php
@@ -20,10 +20,6 @@ function formatBytes($bytes, $precision = 2)
       </h3>
     </div>
   </div>
-  <div id="result-8" class="alert alert-dismissible fade show m-2" style="display:none;">
-    <button type="button" class="btn-close" aria-label="Close" onclick="closeResult8()"></button>
-    <span id="result-message-8"></span>
-  </div>
   @if($backups->isEmpty())
   <div class="card-body">
     <div class="row">
@@ -37,8 +33,8 @@ function formatBytes($bytes, $precision = 2)
     <table class="table table-hover">
       <thead>
       <tr>
-        <th>{{ __('Date') }}</th>
         <th>{{ __('Server') }}</th>
+        <th>{{ __('Date') }}</th>
         <th>{{ __('Name') }}</th>
         <th>{{ __('Size') }}</th>
         <th></th>
@@ -48,10 +44,14 @@ function formatBytes($bytes, $precision = 2)
       @foreach($backups->sortByDesc('updated_at') as $backup)
       <tr>
         <td>
-          {{ $backup->updated_at->format('Y-m-d H:i:s') }}
+          <span class="font-lg mb-3 fw-bold">
+            <a href="{{ route('ynh.servers.edit', $backup->server->id) }}">
+              {{ $backup->server->name }}
+            </a>
+          </span>
         </td>
         <td>
-          {{ $backup->server->name }}
+          {{ $backup->updated_at->format('Y-m-d H:i:s') }}
         </td>
         <td>
           {{ $backup->name }}
@@ -60,8 +60,8 @@ function formatBytes($bytes, $precision = 2)
           {{ formatBytes($backup->size) }}
         </td>
         <td>
-          @if($server->isReady() && Auth::user()->canManageServers())
-          <a href="/ynh/servers/{{ $server->id }}/backup/{{ $backup->id }}"
+          @if($backup->server->isReady() && Auth::user()->canManageServers())
+          <a href="/ynh/servers/{{ $backup->server->id }}/backup/{{ $backup->id }}"
              class="cursor-pointer"
              title="download">
             <img src="{{ asset('images/download.png') }}" height="20" class="float-end">
@@ -70,7 +70,7 @@ class="cursor-pointer"
         </td>
       </tr>
       <tr>
-        <td colspan="4">
+        <td colspan="5">
           @foreach($backup->result['apps'] as $app => $status)
           @if($status === 'Success')
           <span class="tw-pill rounded-pill bg-success">{{ $app }}</span>
@@ -86,12 +86,4 @@ class="cursor-pointer"
   </div>
   @endif
 </div>
-<script>
-
-  function closeResult8() {
-    const resultDiv = document.getElementById('result-8');
-    resultDiv.style.display = 'none';
-  }
-
-</script>
 @endif
\ No newline at end of file
diff --git a/resources/views/home/cards/_towerify_domains.blade.php b/resources/views/home/cards/_towerify_domains.blade.php
index 3eab338..92bbdac 100644
--- a/resources/views/home/cards/_towerify_domains.blade.php
+++ b/resources/views/home/cards/_towerify_domains.blade.php
@@ -20,7 +20,7 @@
     <table class="table table-hover">
       <thead>
       <tr>
-        <th>{{ __('Name') }}</th>
+        <th>{{ __('Server') }}</th>
         <th>{{ __('IP V4') }}</th>
         <th>{{ __('IP V6') }}</th>
         <th>{{ __('Domain') }}</th>