fix(characters): prevent orphan character to show errors on page

Closes eveseat/seat#642
eveseat · Aug 21, 2020 · bbf32f6 · bbf32f6
1 parent a682d00
commit bbf32f6
Show file tree

Hide file tree

Showing 17 changed files with 187 additions and 119 deletions.
diff --git a/src/resources/views/character/assets/assets.blade.php b/src/resources/views/character/assets/assets.blade.php
@@ -20,13 +20,17 @@
     <div class="card-body">
       <div class="mb-3">
         <select multiple="multiple" id="dt-character-selector" class="form-control" style="width: 100%;">
-          @foreach($character->refresh_token->user->characters as $character_info)
-            @if($character_info->character_id == $character->character_id)
-              <option selected="selected" value="{{ $character_info->character_id }}">{{ $character_info->name }}</option>
-            @else
-              <option value="{{ $character_info->character_id }}">{{ $character_info->name }}</option>
-            @endif
-          @endforeach
+          @if($character->refresh_token)
+            @foreach($character->refresh_token->user->characters as $character_info)
+              @if($character_info->character_id == $character->character_id)
+                <option selected="selected" value="{{ $character_info->character_id }}">{{ $character_info->name }}</option>
+              @else
+                <option value="{{ $character_info->character_id }}">{{ $character_info->name }}</option>
+              @endif
+            @endforeach
+          @else
+            <option selected="selected" value="{{ $character->character_id }}">{{ $character->name }}</option>
+          @endif
         </select>
       </div>
 

diff --git a/src/resources/views/character/blueprint.blade.php b/src/resources/views/character/blueprint.blade.php
@@ -15,13 +15,17 @@
     <div class="card-body">
       <div class="mb-3">
         <select multiple="multiple" id="dt-character-selector" class="form-control" style="width: 100%;">
-          @foreach($character->refresh_token->user->characters as $character_info)
-            @if($character_info->character_id == $character->character_id)
-              <option selected="selected" value="{{ $character_info->character_id }}">{{ $character_info->name }}</option>
-            @else
-              <option value="{{ $character_info->character_id }}">{{ $character_info->name }}</option>
-            @endif
-          @endforeach
+          @if($character->refresh_token)
+            @foreach($character->refresh_token->user->characters as $character_info)
+              @if($character_info->character_id == $character->character_id)
+                <option selected="selected" value="{{ $character_info->character_id }}">{{ $character_info->name }}</option>
+              @else
+                <option value="{{ $character_info->character_id }}">{{ $character_info->name }}</option>
+              @endif
+            @endforeach
+          @else
+            <option selected="selected" value="{{ $character->character_id }}">{{ $character->name }}</option>
+          @endif
         </select>
       </div>
 

diff --git a/src/resources/views/character/bookmarks.blade.php b/src/resources/views/character/bookmarks.blade.php
@@ -23,13 +23,17 @@ class="btn btn-sm btn-light">
     <div class="card-body">
       <div class="mb-3">
         <select multiple="multiple" id="dt-character-selector" class="form-control" style="width: 100%;">
-          @foreach($character->refresh_token->user->characters as $character_info)
-            @if($character_info->character_id == $character->character_id)
-              <option selected="selected" value="{{ $character_info->character_id }}">{{ $character_info->name }}</option>
-            @else
-              <option value="{{ $character_info->character_id }}">{{ $character_info->name }}</option>
-            @endif
-          @endforeach
+          @if($character->refresh_token)
+            @foreach($character->refresh_token->user->characters as $character_info)
+              @if($character_info->character_id == $character->character_id)
+                <option selected="selected" value="{{ $character_info->character_id }}">{{ $character_info->name }}</option>
+              @else
+                <option value="{{ $character_info->character_id }}">{{ $character_info->name }}</option>
+              @endif
+            @endforeach
+          @else
+            <option selected="selected" value="{{ $character->character_id }}">{{ $character->name }}</option>
+          @endif
         </select>
       </div>
 

diff --git a/src/resources/views/character/calendar.blade.php b/src/resources/views/character/calendar.blade.php
@@ -23,13 +23,17 @@ class="btn btn-sm btn-light">
     <div class="card-body">
       <div class="mb-3">
         <select multiple="multiple" id="dt-character-selector" class="form-control" style="width: 100%;">
-          @foreach($character->refresh_token->user->characters as $character_info)
-            @if($character_info->character_id == $character->character_id)
-              <option selected="selected" value="{{ $character_info->character_id }}">{{ $character_info->name }}</option>
-            @else
-              <option value="{{ $character_info->character_id }}">{{ $character_info->name }}</option>
-            @endif
-          @endforeach
+          @if($character->refresh_token)
+            @foreach($character->refresh_token->user->characters as $character_info)
+              @if($character_info->character_id == $character->character_id)
+                <option selected="selected" value="{{ $character_info->character_id }}">{{ $character_info->name }}</option>
+              @else
+                <option value="{{ $character_info->character_id }}">{{ $character_info->name }}</option>
+              @endif
+            @endforeach
+          @else
+            <option selected="selected" value="{{ $character->character_id }}">{{ $character->name }}</option>
+          @endif
         </select>
       </div>
 

diff --git a/src/resources/views/character/contacts.blade.php b/src/resources/views/character/contacts.blade.php
@@ -13,13 +13,17 @@
     <div class="card-body">
       <div class="mb-3">
         <select multiple="multiple" id="dt-character-selector" class="form-control" style="width: 100%;">
-          @foreach($character->refresh_token->user->characters as $character_info)
-            @if($character_info->character_id == $character->character_id)
-              <option selected="selected" value="{{ $character_info->character_id }}">{{ $character_info->name }}</option>
-            @else
-              <option value="{{ $character_info->character_id }}">{{ $character_info->name }}</option>
-            @endif
-          @endforeach
+          @if($character->refresh_token)
+            @foreach($character->refresh_token->user->characters as $character_info)
+              @if($character_info->character_id == $character->character_id)
+                <option selected="selected" value="{{ $character_info->character_id }}">{{ $character_info->name }}</option>
+              @else
+                <option value="{{ $character_info->character_id }}">{{ $character_info->name }}</option>
+              @endif
+            @endforeach
+          @else
+            <option selected="selected" value="{{ $character->character_id }}">{{ $character->name }}</option>
+          @endif
         </select>
       </div>
 

diff --git a/src/resources/views/character/contracts.blade.php b/src/resources/views/character/contracts.blade.php
@@ -13,13 +13,17 @@
     <div class="card-body">
       <div class="mb-3">
         <select multiple="multiple" id="dt-character-selector" class="form-control" style="width: 100%;">
-          @foreach($character->refresh_token->user->characters as $character_info)
-            @if($character_info->character_id == $character->character_id)
-              <option selected="selected" value="{{ $character_info->character_id }}">{{ $character_info->name }}</option>
-            @else
-              <option value="{{ $character_info->character_id }}">{{ $character_info->name }}</option>
-            @endif
-          @endforeach
+          @if($character->refresh_token)
+            @foreach($character->refresh_token->user->characters as $character_info)
+              @if($character_info->character_id == $character->character_id)
+                <option selected="selected" value="{{ $character_info->character_id }}">{{ $character_info->name }}</option>
+              @else
+                <option value="{{ $character_info->character_id }}">{{ $character_info->name }}</option>
+              @endif
+            @endforeach
+          @else
+            <option selected="selected" value="{{ $character->character_id }}">{{ $character->name }}</option>
+          @endif
         </select>
       </div>
 

diff --git a/src/resources/views/character/fittings.blade.php b/src/resources/views/character/fittings.blade.php
@@ -23,13 +23,17 @@ class="btn btn-sm btn-light">
     <div class="card-body">
       <div class="mb-3">
         <select multiple="multiple" id="dt-character-selector" class="form-control" style="width: 100%;">
-          @foreach($character->refresh_token->user->characters as $character_info)
-            @if($character_info->character_id == $character->character_id)
-              <option selected="selected" value="{{ $character_info->character_id }}">{{ $character_info->name }}</option>
-            @else
-              <option value="{{ $character_info->character_id }}">{{ $character_info->name }}</option>
-            @endif
-          @endforeach
+          @if($character->refresh_token)
+            @foreach($character->refresh_token->user->characters as $character_info)
+              @if($character_info->character_id == $character->character_id)
+                <option selected="selected" value="{{ $character_info->character_id }}">{{ $character_info->name }}</option>
+              @else
+                <option value="{{ $character_info->character_id }}">{{ $character_info->name }}</option>
+              @endif
+            @endforeach
+          @else
+            <option selected="selected" value="{{ $character->character_id }}">{{ $character->name }}</option>
+          @endif
         </select>
       </div>
 

diff --git a/src/resources/views/character/industry.blade.php b/src/resources/views/character/industry.blade.php
@@ -23,13 +23,17 @@ class="btn btn-sm btn-light">
     <div class="card-body">
       <div class="mb-3">
         <select multiple="multiple" id="dt-character-selector" class="form-control" style="width: 100%;">
-          @foreach($character->refresh_token->user->characters as $character_info)
-            @if($character_info->character_id == $character->character_id)
-              <option selected="selected" value="{{ $character_info->character_id }}">{{ $character_info->name }}</option>
-            @else
-              <option value="{{ $character_info->character_id }}">{{ $character_info->name }}</option>
-            @endif
-          @endforeach
+          @if($character->refresh_token)
+            @foreach($character->refresh_token->user->characters as $character_info)
+              @if($character_info->character_id == $character->character_id)
+                <option selected="selected" value="{{ $character_info->character_id }}">{{ $character_info->name }}</option>
+              @else
+                <option value="{{ $character_info->character_id }}">{{ $character_info->name }}</option>
+              @endif
+            @endforeach
+          @else
+            <option selected="selected" value="{{ $character->character_id }}">{{ $character->name }}</option>
+          @endif
         </select>
       </div>
 

diff --git a/src/resources/views/character/intel/summary.blade.php b/src/resources/views/character/intel/summary.blade.php
@@ -15,13 +15,17 @@
     <div class="card-body">
       <div class="mb-3">
         <select multiple="multiple" id="dt-character-selector" class="form-control" style="width: 100%;">
-          @foreach($character->refresh_token->user->characters as $character_info)
-            @if($character_info->character_id == $character->character_id)
-              <option selected="selected" value="{{ $character_info->character_id }}">{{ $character_info->name }}</option>
-            @else
-              <option value="{{ $character_info->character_id }}">{{ $character_info->name }}</option>
-            @endif
-          @endforeach
+          @if($character->refresh_token)
+            @foreach($character->refresh_token->user->characters as $character_info)
+              @if($character_info->character_id == $character->character_id)
+                <option selected="selected" value="{{ $character_info->character_id }}">{{ $character_info->name }}</option>
+              @else
+                <option value="{{ $character_info->character_id }}">{{ $character_info->name }}</option>
+              @endif
+            @endforeach
+          @else
+            <option selected="selected" value="{{ $character->character_id }}">{{ $character->name }}</option>
+          @endif
         </select>
       </div>
     </div>

diff --git a/src/resources/views/character/killmails.blade.php b/src/resources/views/character/killmails.blade.php
@@ -23,13 +23,17 @@ class="btn btn-sm btn-light">
     <div class="card-body">
       <div class="mb-3">
         <select multiple="multiple" id="dt-character-selector" class="form-control" style="width: 100%;">
-          @foreach($character->refresh_token->user->characters as $character_info)
-            @if($character_info->character_id == $character->character_id)
-              <option selected="selected" value="{{ $character_info->character_id }}">{{ $character_info->name }}</option>
-            @else
-              <option value="{{ $character_info->character_id }}">{{ $character_info->name }}</option>
-            @endif
-          @endforeach
+          @if($character->refresh_token)
+            @foreach($character->refresh_token->user->characters as $character_info)
+              @if($character_info->character_id == $character->character_id)
+                <option selected="selected" value="{{ $character_info->character_id }}">{{ $character_info->name }}</option>
+              @else
+                <option value="{{ $character_info->character_id }}">{{ $character_info->name }}</option>
+              @endif
+            @endforeach
+          @else
+            <option selected="selected" value="{{ $character->character_id }}">{{ $character->name }}</option>
+          @endif
         </select>
       </div>
 

diff --git a/src/resources/views/character/market.blade.php b/src/resources/views/character/market.blade.php
@@ -21,13 +21,17 @@ class="btn btn-sm btn-light">
     <div class="card-body">
       <div class="mb-3">
         <select multiple="multiple" id="dt-character-selector" class="form-control" style="width: 100%;">
-          @foreach($character->refresh_token->user->characters as $character_info)
-            @if($character_info->character_id == $character->character_id)
-              <option selected="selected" value="{{ $character_info->character_id }}">{{ $character_info->name }}</option>
-            @else
-              <option value="{{ $character_info->character_id }}">{{ $character_info->name }}</option>
-            @endif
-          @endforeach
+          @if($character->refresh_token)
+            @foreach($character->refresh_token->user->characters as $character_info)
+              @if($character_info->character_id == $character->character_id)
+                <option selected="selected" value="{{ $character_info->character_id }}">{{ $character_info->name }}</option>
+              @else
+                <option value="{{ $character_info->character_id }}">{{ $character_info->name }}</option>
+              @endif
+            @endforeach
+          @else
+            <option selected="selected" value="{{ $character->character_id }}">{{ $character->name }}</option>
+          @endif
         </select>
       </div>
 

diff --git a/src/resources/views/character/mining-ledger.blade.php b/src/resources/views/character/mining-ledger.blade.php
@@ -12,13 +12,17 @@
     <div class="card-body">
       <div class="mb-3">
         <select multiple="multiple" id="dt-character-selector" class="form-control" style="width: 100%;">
-          @foreach($character->refresh_token->user->characters as $character_info)
-            @if($character_info->character_id == $character->character_id)
-              <option selected="selected" value="{{ $character_info->character_id }}">{{ $character_info->name }}</option>
-            @else
-              <option value="{{ $character_info->character_id }}">{{ $character_info->name }}</option>
-            @endif
-          @endforeach
+          @if($character->refresh_token)
+            @foreach($character->refresh_token->user->characters as $character_info)
+              @if($character_info->character_id == $character->character_id)
+                <option selected="selected" value="{{ $character_info->character_id }}">{{ $character_info->name }}</option>
+              @else
+                <option value="{{ $character_info->character_id }}">{{ $character_info->name }}</option>
+              @endif
+            @endforeach
+          @else
+            <option selected="selected" value="{{ $character->character_id }}">{{ $character->name }}</option>
+          @endif
         </select>
       </div>
 

diff --git a/src/resources/views/character/notifications.blade.php b/src/resources/views/character/notifications.blade.php
@@ -23,13 +23,17 @@ class="btn btn-sm btn-light">
     <div class="card-body">
       <div class="mb-3">
         <select multiple="multiple" id="dt-character-selector" class="form-control" style="width: 100%;">
-          @foreach($character->refresh_token->user->characters as $character_info)
-            @if($character_info->character_id == $character->character_id)
-              <option selected="selected" value="{{ $character_info->character_id }}">{{ $character_info->name }}</option>
-            @else
-              <option value="{{ $character_info->character_id }}">{{ $character_info->name }}</option>
-            @endif
-          @endforeach
+          @if($character->refresh_token)
+            @foreach($character->refresh_token->user->characters as $character_info)
+              @if($character_info->character_id == $character->character_id)
+                <option selected="selected" value="{{ $character_info->character_id }}">{{ $character_info->name }}</option>
+              @else
+                <option value="{{ $character_info->character_id }}">{{ $character_info->name }}</option>
+              @endif
+            @endforeach
+          @else
+            <option selected="selected" value="{{ $character->character_id }}">{{ $character->name }}</option>
+          @endif
         </select>
       </div>
 

diff --git a/src/resources/views/character/research.blade.php b/src/resources/views/character/research.blade.php
@@ -23,13 +23,17 @@ class="btn btn-sm btn-light">
     <div class="card-body">
       <div class="mb-3">
         <select multiple="multiple" id="dt-character-selector" class="form-control" style="width: 100%;">
-          @foreach($character->refresh_token->user->characters as $character_info)
-            @if($character_info->character_id == $character->character_id)
-              <option selected="selected" value="{{ $character_info->character_id }}">{{ $character_info->name }}</option>
-            @else
-              <option value="{{ $character_info->character_id }}">{{ $character_info->name }}</option>
-            @endif
-          @endforeach
+          @if($character->refresh_token)
+            @foreach($character->refresh_token->user->characters as $character_info)
+              @if($character_info->character_id == $character->character_id)
+                <option selected="selected" value="{{ $character_info->character_id }}">{{ $character_info->name }}</option>
+              @else
+                <option value="{{ $character_info->character_id }}">{{ $character_info->name }}</option>
+              @endif
+            @endforeach
+          @else
+            <option selected="selected" value="{{ $character->character_id }}">{{ $character->name }}</option>
+          @endif
         </select>
       </div>
 

diff --git a/src/resources/views/character/standings.blade.php b/src/resources/views/character/standings.blade.php
@@ -11,13 +11,17 @@
     <div class="card-body">
       <div class="mb-3">
         <select multiple="multiple" id="dt-character-selector" class="form-control" style="width: 100%;">
-          @foreach($character->refresh_token->user->characters as $character_info)
-            @if($character_info->character_id == $character->character_id)
-              <option selected="selected" value="{{ $character_info->character_id }}">{{ $character_info->name }}</option>
-            @else
-              <option value="{{ $character_info->character_id }}">{{ $character_info->name }}</option>
-            @endif
-          @endforeach
+          @if($character->refresh_token)
+            @foreach($character->refresh_token->user->characters as $character_info)
+              @if($character_info->character_id == $character->character_id)
+                <option selected="selected" value="{{ $character_info->character_id }}">{{ $character_info->name }}</option>
+              @else
+                <option value="{{ $character_info->character_id }}">{{ $character_info->name }}</option>
+              @endif
+            @endforeach
+          @else
+            <option selected="selected" value="{{ $character->character_id }}">{{ $character->name }}</option>
+          @endif
         </select>
       </div>