Merge remote-tracking branch 'origin/2.0' into 2.0

resources/assets/dcat/extra/upload.scss

@@ -301,7 +301,8 @@
 
 .web-uploader .filelist li img {
   max-width: 95%;
-  height: 120px
+  height: 120px;
+  object-fit: cover;
 }
 
 .web-uploader .filelist li p.error {

resources/assets/dcat/plugins/webuploader/webuploader.css

@@ -303,7 +303,8 @@
 
 .web-uploader .filelist li img {
 	width: auto;
-	height: 120px
+	height: 120px;
+	object-fit: cover;
 }
 
 .web-uploader .filelist li p.error {

resources/dist/dcat/plugins/webuploader/webuploader.css

@@ -303,7 +303,8 @@
 
 .web-uploader .filelist li img {
 	width: auto;
-	height: 120px
+	height: 120px;
+	object-fit: cover;
 }
 
 .web-uploader .filelist li p.error {

src/Actions/Action.php

@@ -247,7 +247,7 @@ HTML;
             $attributes['href'] = $href;
         }
 
-        $this->defaultHtmlAttribute('style', 'cursor: pointer');
+        $this->defaultHtmlAttribute('style', 'cursor: pointer;');
         $this->setHtmlAttribute($attributes);
     }
 

src/Extend/Setting.php

@@ -43,7 +43,7 @@ abstract class Setting extends Form implements LazyRenderable
     {
         $this->extension()->config($this->formatInput($input));
 
-        return $this->response()->success(trans('admin.save_succeeded'));
+        return $this->response()->success(trans('admin.save_succeeded'))->refresh();
     }
 
     /**

src/Grid/Model.php

@@ -649,6 +649,19 @@ class Model
         return $this;
     }
 
+    public function getSortQueries()
+    {
+        return $this->findQueryByMethod('orderBy')
+            ->merge($this->findQueryByMethod('orderByDesc'))
+            ->merge($this->findQueryByMethod('latest'))
+            ->merge($this->findQueryByMethod('oldest'));
+    }
+
+    public function getSortDescMethods()
+    {
+        return ['orderByDesc', 'latest'];
+    }
+
     /**
      * @param \Illuminate\Database\Query\Builder $query
      * @param bool $fetch

src/Repositories/EloquentRepository.php

@@ -182,13 +182,13 @@ class EloquentRepository extends Repository implements TreeRepository
         [$column, $type, $cast] = $model->getSort();
 
         if (empty($column) || empty($type)) {
-            $orders = $model->findQueryByMethod('orderBy')->merge($model->findQueryByMethod('orderByDesc'));
+            $orders = $model->getSortQueries();
 
             $model->resetOrderBy();
 
             $orders->each(function ($orderBy) use ($model) {
                 $column = $orderBy['arguments'][0];
-                $type = $orderBy['method'] === 'orderByDesc' ? 'desc' : ($orderBy['arguments'][1] ?? 'asc');
+                $type = in_array($orderBy['method'], $model->getSortDescMethods(), true) ? 'desc' : ($orderBy['arguments'][1] ?? 'asc');
                 $cast = null;
 
                 $this->addOrderBy($model, $column, $type, $cast);