From daf6d98a3b8272c3154d023113fb3a16c81882b4 Mon Sep 17 00:00:00 2001
From: Martin Meredith <martin@sourceguru.net>
Date: Fri, 8 Mar 2019 20:46:47 +0000
Subject: [PATCH 1/2] Remove test data for Pie (#6793)

---
 resources/views/dashboard.blade.php | 39 +----------------------------
 1 file changed, 1 insertion(+), 38 deletions(-)

diff --git a/resources/views/dashboard.blade.php b/resources/views/dashboard.blade.php
index 89eb5354b5..749e530068 100755
--- a/resources/views/dashboard.blade.php
+++ b/resources/views/dashboard.blade.php
@@ -317,44 +317,7 @@
           success: function (data) {
               var myPieChart = new Chart(ctx,{
                   type   : 'doughnut',
-                  data   : {
-    "labels": [
-        "Ready to Deploy (1,273)",
-        "Pending (50)",
-        "Archived (50)"
-    ],
-    "datasets": [
-        {
-            "data": [
-                1273,
-                50,
-                50,
-            ],
-            "backgroundColor": [
-                "#f56954",
-                "#00a65a",
-                "#f39c12",
-                "#00c0ef",
-                "#3c8dbc",
-                "#d2d6de",
-                "#3c8dbc",
-                "#3c8dbc",
-                "#3c8dbc"
-            ],
-            "hoverBackgroundColor": [
-                "#f56954",
-                "#00a65a",
-                "#f39c12",
-                "#00c0ef",
-                "#3c8dbc",
-                "#d2d6de",
-                "#3c8dbc",
-                "#3c8dbc",
-                "#3c8dbc"
-            ]
-        }
-    ]
-},
+                  data   : data,
                   options: pieOptions
               });
           },

From 55cbbf2b000fae9996f7f72d65425cf2397f87dc Mon Sep 17 00:00:00 2001
From: Martin Meredith <martin@sourceguru.net>
Date: Fri, 8 Mar 2019 20:47:37 +0000
Subject: [PATCH 2/2] Fixes #6794: Fix URLs to access some 'missing' images
 (#6795)

* Fix image path for Model view

* Fix URLs for images in account view

* Fix Supplier view Image URL
---
 resources/views/account/view-assets.blade.php | 4 ++--
 resources/views/models/view.blade.php         | 2 +-
 resources/views/suppliers/view.blade.php      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/resources/views/account/view-assets.blade.php b/resources/views/account/view-assets.blade.php
index 04f71bec28..2fdde4554f 100755
--- a/resources/views/account/view-assets.blade.php
+++ b/resources/views/account/view-assets.blade.php
@@ -67,10 +67,10 @@ View Assets for  {{ $user->present()->fullName() }}
                   <td>{{ $asset->serial }}</td>
                   <td>
                     @if (($asset->image) && ($asset->image!=''))
-                      <img src="{{ url('/') }}/uploads/assets/{{ $asset->image }}" height="50" width="50">
+                      <img src="{{ Storage::disk('public')->url(app('assets_upload_path').e($asset->image)) }}" height="50" width="50">
 
                     @elseif (($asset->model) && ($asset->model->image!=''))
-                      <img src="{{ url('/') }}/uploads/models/{{ $asset->model->image }}" height="50" width="50">
+                      <img src="{{ Storage::disk('public')->url(app('models_upload_path').e($asset->model->image)) }}" height="50" width="50">
                     @endif
                   </td>
                 </tr>
diff --git a/resources/views/models/view.blade.php b/resources/views/models/view.blade.php
index d110bbcdc1..5bd709b9cf 100755
--- a/resources/views/models/view.blade.php
+++ b/resources/views/models/view.blade.php
@@ -96,7 +96,7 @@
           <div class="box-body">
 
               @if ($model->image)
-                  <img src="{{ url('/') }}/uploads/models/{{ $model->image }}" class="img-responsive"></li>
+                  <img src="{{ Storage::disk('public')->url(app('models_upload_path').e($model->image)) }}" class="img-responsive"></li>
               @endif
 
 
diff --git a/resources/views/suppliers/view.blade.php b/resources/views/suppliers/view.blade.php
index 28e225a7b3..7d0271be7d 100755
--- a/resources/views/suppliers/view.blade.php
+++ b/resources/views/suppliers/view.blade.php
@@ -278,7 +278,7 @@
     </ul>
       @if ($supplier->image!='')
         <div class="col-md-12 text-center" style="padding-bottom: 20px;">
-          <img src="{{ app('suppliers_upload_url') }}/{{ $supplier->image }}" class="img-responsive img-thumbnail" alt="{{ $supplier->name }}">
+          <img src="{{ Storage::disk('public')->url(app('suppliers_upload_url').e($supplier->image)) }}" class="img-responsive img-thumbnail" alt="{{ $supplier->name }}">
         </div>
       @endif