close #191 Fixed : When trying to edit Companies. it is broken

app/Listeners/Updates/Version119.php

@@ -92,7 +92,10 @@ class Version119 extends Listener
             $items = $data[basename($model)];
 
             foreach ($items as $item) {
-                if ($item->$name) {
+                if (!$item->$name) {
+                    continue;
+                }
+
                 $path = explode('uploads/', $item->$name);
 
                 $path = end($path);
@@ -102,20 +105,30 @@ class Version119 extends Listener
                 }
 
                 if (!empty($path) && Storage::exists($path)) {
+                    $media = \App\Models\Common\Media::where('filename', '=', pathinfo(basename($path), PATHINFO_FILENAME))->first();
+
+                    if ($media) {
+                        $item->attachMedia($media, $name);
+
+                        continue;
+                    }
+
                     $media = MediaUploader::importPath(config('mediable.default_disk'), $path);
 
                     $item->attachMedia($media, $name);
                 }
             }
         }
-        }
 
         $settings['company_logo'] = \App\Models\Setting\Setting::where('key', '=', 'general.company_logo')->where('company_id', '<>', '0')->get();
         $settings['invoice_logo'] = \App\Models\Setting\Setting::where('key', '=', 'general.invoice_logo')->where('company_id', '<>', '0')->get();
 
         foreach ($settings as $name => $items) {
             foreach ($items as $item) {
-                if ($item->value) {
+                if (!$item->value) {
+                    continue;
+                }
+
                 $path = explode('uploads/', $item->value);
 
                 $path = end($path);
@@ -146,5 +159,4 @@ class Version119 extends Listener
             }
         }
     }
-    }
 }

app/Models/Company/Company.php

@@ -236,14 +236,8 @@ class Company extends Eloquent
      *
      * @return string
      */
-    public function getCompanyLogoAttribute($value)
+    public function getCompanyLogoAttribute()
     {
-        if (!empty($value) && !$this->hasMedia('company_logo')) {
-            return $value;
-        } elseif (!$this->hasMedia('company_logo')) {
-            return false;
-        }
-
         return $this->getMedia('company_logo')->last();
     }
 }

public/css/app.css

@@ -538,3 +538,8 @@ ul.add-new.nav.navbar-nav.pull-left {
     margin-top: 25px;
     margin-bottom: 10px;
 }
+
+span.picture, span.attachment {
+    margin-left: 10px;
+    vertical-align: middle;
+}