wip #7868 @0.5

diff --git a/src/app/Magic/Traits/CustomDataSource.php b/src/app/Magic/Traits/CustomDataSource.php
index 856c6f6087ec63f05739b7803acaac37b277d938..a73f9a476793479793884352a1804686a3e3399b 100644 (file)
--- a/src/app/Magic/Traits/CustomDataSource.php
+++ b/src/app/Magic/Traits/CustomDataSource.php
@@ -63,8 +63,9 @@ trait CustomDataSource
             $keys[] = $row[$pk];
         }
 
-        $toInsert = $keys;
+        $toInsert = array_diff($keys, $existingKeys);
         $toDelete = array_diff($existingKeys, $keys);
+        $toUpdate = array_diff(array_diff($keys, $toInsert), $toDelete);
 
         $inserts = [];
         foreach ($toInsert as $hash) {
@@ -72,20 +73,11 @@ trait CustomDataSource
                 $inserts[$hash] = $rows[$hash];
             }
         }
-
-
-        try {
-            foreach ($inserts as $key => $i) {
-                $id = [$pk => $key];
-                $data = $i;
-                unset($data[$pk]);
-                static::updateOrCreate($id, $data);
-            }
-        } catch (\Exception $e) {
-            $hadError = true;
-            Log::error($e);
+        foreach ($toUpdate as $hash) {
+            static::where($pk, $hash)->update($rows[$hash]);
         }
 
+        self::insert($inserts);
         static::whereIn($pk, $toDelete)->forceDelete();
         Cache::put(static::getCacheKey() . '_refresh', $hadError ? -1 : time());
     }

diff --git a/src/resources/views/columns/url.blade.php b/src/resources/views/columns/url.blade.php
index 3933561d83264f47998a13f1a0c98d8b52c97c46..b4f375c61950920477bb7aeb8ea05cac84e88146 100644 (file)
--- a/src/resources/views/columns/url.blade.php
+++ b/src/resources/views/columns/url.blade.php
@@ -2,10 +2,17 @@
 @php
     $value = data_get($entry, $column['name']);
     $value = is_array($value) ? json_encode($value) : $value;
+
+    $url=$value;
+    $url=preg_replace('/^https?:\/\//','',$url);
+    $limit=50;
+    if(strlen($url)>$limit){
+        $url=substr($url,0,$limit-3).'...';
+    }
 @endphp
 
 <span>
     @includeWhen(!empty($column['wrapper']), 'crud::columns.inc.wrapper_start')
-    <a href="{{$value}}" target="_blank">{{ $value }}</a>
+    <a title="{{$value}}" href="{{$value}}" target="_blank">{{ $url }}</a>
     @includeWhen(!empty($column['wrapper']), 'crud::columns.inc.wrapper_end')
 </span>