Merge branch 'master' of https://github.com/Laravel-Backpack/CRUD into fix-for-left-join-clauses

Author: tabacitu

README.md

@@ -53,6 +53,12 @@ Quickly build an admin interface for your Eloquent models. Then customize every
 
 But professionals don't love Backpack just because it's feature-packed. They also love it because it's ridiculously easy to overwrite a functionality. Generally, you just need to create a function with the right name or create a blade file with the right name. Yes, it can be _that_ easy. See why thousands of Laravel professionals have been using Backpack, every day, since 2016.
 
+## Screenshots
+
+![https://user-images.githubusercontent.com/1032474/86720524-c5a1d480-c02d-11ea-87ed-d03b0197eb25.gif](https://user-images.githubusercontent.com/1032474/86720524-c5a1d480-c02d-11ea-87ed-d03b0197eb25.gif)
+
+The GIF above should give you with a good idea about what Backpack will help you build. But you can also see it in action in our [live demo](https://demo.backpackforlaravel.com/admin), to get a deeper understanding of how Backpack admin panels look & feel and the amount of features it provides.
+
 ## Getting started
 
 Start with the ["Getting Started" series](https://backpackforlaravel.com/docs/4.0/introduction) in our docs. We try to nudge you towards creating a Backpack acccount, but you don't _need_ one, if you're just trying it out.
@@ -73,12 +79,6 @@ Installation guides:
 - [Install Backpack 3.x on Laravel 5.3](https://laravel-backpack.readme.io/docs/installation-on-laravel-53) - last feature update was 02 Feb 2017;
 - [Install Backpack 3.x on Laravel 5.2](https://laravel-backpack.readme.io/docs/installation) - deprecated, lacks a lot of features;
 
-## Screenshots
-
-![https://user-images.githubusercontent.com/1032474/86720524-c5a1d480-c02d-11ea-87ed-d03b0197eb25.gif](https://user-images.githubusercontent.com/1032474/86720524-c5a1d480-c02d-11ea-87ed-d03b0197eb25.gif)
-
-Play around in our [live demo](https://demo.backpackforlaravel.com/admin).
-
 ## Change Log
 
 For the current release (4.1.x) please see [the Releases tab](https://github.com/Laravel-Backpack/CRUD/releases). For previous versions (Backpack <=4.0.x), please see our old [CHANGELOG](CHANGELOG.md) file.

package-lock.json

@@ -13,10 +13,10 @@
         "cross-env": "^7.0.0",
         "css-loader": "^3.6.0",
         "laravel-mix": "^5.0.0",
-        "lodash": "^4.17.13",
+        "lodash": "^4.17.19",
         "pace": "0.0.4",
         "resolve-url-loader": "^3.1.1",
-        "sass": "^1.26.9",
+        "sass": "^1.26.10",
         "sass-loader": "^8.0.2",
         "vue-template-compiler": "^2.6.11"
     },
@@ -37,7 +37,7 @@
         "datatables.net-fixedheader-bs4": "^3.1.6",
         "datatables.net-responsive": "^2.2.5",
         "datatables.net-responsive-bs4": "^2.2.5",
-        "easymde": "^2.10.1",
+        "easymde": "^2.11.0",
         "jquery": "^3.5.1",
         "jquery-colorbox": "^1.6.4",
         "jquery-cropper": "^1.0.1",
@@ -54,11 +54,11 @@
         "popper.js": "^1.16.1",
         "select2": "^4.0.13",
         "select2-bootstrap-theme": "0.1.0-beta.10",
-        "simple-line-icons": "^2.4.1",
+        "simple-line-icons": "^2.5.2",
         "simplemde": "^1.11.2",
         "source-sans-pro": "^3.6",
         "summernote": "^0.8.18",
         "sweetalert": "^2.1.2",
-        "tinymce": "^5.4.0"
+        "tinymce": "^5.4.1"
     }
 }

package.json

@@ -46,6 +46,6 @@ private function checkLicenseCodeExists()
      */
     private function validCode($j)
     {
-        $k = str_replace('-', '', $j); $s = substr($k, 0, 8); $c = substr($k, 8, 2); $a = substr($k, 10, 2); $l = substr($k, 12, 2); $p = substr($k, 14, 2); $n = substr($k, 16, 2); $m = substr($k, 18, 2); $z = substr($k, 20, 24); $w = 'ADEFHKLMVWXYZ146'; $x = $s; for ($i = 0; $i < strlen($w); $i++) { $r = $w[$i]; $x = str_replace($r, '-', $x); } $x = str_replace('-', '', $x); if ($x != '') { return false; } if (substr_count($j, '-') != 5) { return false; } $e = substr(crc32(substr($k, 0, 20)), -4); if ($z !== $e) { return false; } $o = strrev(substr(preg_replace('/[0-9]+/', '', strtoupper(sha1($a.'sand('.$s.')'.$n.'tos()'))), 2, 2)); if ($m !== $o) { return false; } return true;
+        $k = str_replace('-', '', $j); $s = substr($k, 0, 8); $c = substr($k, 8, 2); $a = substr($k, 10, 2); $l = substr($k, 12, 2); $p = substr($k, 14, 2); $n = substr($k, 16, 2); $m = substr($k, 18, 2); $z = substr($k, 20, 24); $w = 'ADEFHKLMVWXYZ146'; $x = $s; for ($i = 0; $i < strlen($w); $i++) { $r = $w[$i]; $x = str_replace($r, '-', $x); } $x = str_replace('-', '', $x); if ($x != '') { return false; } if (substr_count($j, '-') != 5) { return false; } $e = substr(hexdec(hash('crc32b', substr($k, 0, 20))), -4); if ($z !== $e) { return false; } $o = strrev(substr(preg_replace('/[0-9]+/', '', strtoupper(sha1($a.'sand('.$s.')'.$n.'tos()'))), 2, 2)); if ($m !== $o) { return false; } $o2 = substr(((int)preg_replace('/[^0-9]/','', $s.$c)==0 ? 8310 : (int)preg_replace('/[^0-9]/','', $s.$c) )*9971, -2);if ($a !== $o2) {return false;} return true; 
     }
 }

src/LicenseCheck.php

@@ -2,6 +2,7 @@
 
 namespace Backpack\CRUD\app\Library\CrudPanel;
 
+use Closure;
 use Illuminate\Support\Str;
 use Symfony\Component\HttpFoundation\ParameterBag;
 

src/app/Library/CrudPanel/CrudFilter.php

@@ -24,18 +24,19 @@ public function getSaveActionDefaultForCurrentOperation()
      */
     public function getFallBackSaveAction()
     {
-        //we get the higher order in save actions array. It will return something only when explicit by developer
+        //we get the higher order in save actions array. By default it would be `save_and_back`
         $higherAction = $this->getSaveActionByOrder(1);
 
-        if (empty($higherAction)) {
-            if ($this->hasOperationSetting('defaultSaveAction')) {
-                return $this->getOperationSetting('defaultSaveAction');
-            }
+        //if there is an higher action and that action is not the backpack default higher one `save_and_back` we return it.
+        if (! empty($higherAction) && key($higherAction) !== 'save_and_back') {
+            return key($higherAction);
+        }
 
-            return $this->getSaveActionDefaultForCurrentOperation();
+        if ($this->hasOperationSetting('defaultSaveAction')) {
+            return $this->getOperationSetting('defaultSaveAction');
         }
 
-        return key($higherAction);
+        return $this->getSaveActionDefaultForCurrentOperation();
     }
 
     /**

src/app/Library/CrudPanel/Traits/SaveActions.php

@@ -55,7 +55,7 @@ function backpack_users_have_email()
      */
     function backpack_avatar_url($user)
     {
-        $firstLetter = $user->getAttribute('name') ? $user->name[0] : 'A';
+        $firstLetter = $user->getAttribute('name') ? mb_substr($user->name, 0, 1, 'UTF-8') : 'A';
         $placeholder = 'https://placehold.it/160x160/00a65a/ffffff/&text='.$firstLetter;
 
         switch (config('backpack.base.avatar_type')) {

src/helpers.php

@@ -30,7 +30,7 @@
     'send_reset_link'           => 'Link senden, um Passwort zurückzusetzen',
     'click_here_to_reset'       => 'Klicken Sie hier um Ihr Passwort zurückzusetzen',
     'change_password'           => 'Passwort ändern',
-    'unauthorized'              => 'Unberechtigt.',
+    'unauthorized'              => 'Nicht Autorisiert',
     'dashboard'                 => 'Übersicht',
     'handcrafted_by'            => 'Handgemacht von',
     'powered_by'                => 'Erstellt mit',
@@ -39,6 +39,7 @@
     'save'                      => 'Speichern',
     'cancel'                    => 'Abbrechen',
     'error'                     => 'Fehler',
+    'warning'                   => 'Achtung',
     'success'                   => 'Erfolg',
     'old_password_incorrect'    => 'Altes Passwort ist falsch.',
     'password_dont_match'       => 'Passwörter stimmen nicht überein.',

src/resources/lang/de/base.php

@@ -9,6 +9,7 @@
     */
 
     'registration_closed'    => 'Reģistrācija aizvērta.',
+    'no_email_column'        => 'Lietotājiem nav piesaistītas e-pasta adreses.',
     'first_page_you_see'     => 'Pirmā lapa ko redzat pēc pieslēgšanās',
     'login_status'           => 'Pieslēgšanās statuss',
     'logged_in'              => 'Jūs esat pieslēgušies!',
@@ -40,13 +41,17 @@
     'cancel'                 => 'Atcelt',
     'error'                  => 'Kļūda',
     'success'                => 'Darbība veiksmīga',
+    'warning'                => 'Brīdinājums',
+    'notice'                 => 'Paziņojums',
     'old_password_incorrect' => 'Vecā parole nav pareiza.',
     'password_dont_match'    => 'Paroles nesakrīt.',
     'password_empty'         => 'Pārliecinies vai abi paroļu lauki ir aizpildīti.',
     'password_updated'       => 'Parole nomainīta.',
     'account_updated'        => 'Konta rediģēšana veiksmīga.',
     'unknown_error'          => 'Nezināma kļūda. Lūdzu mēģini vēlreiz.',
     'error_saving'           => 'Kļūda saglabājot. Lūdzu mēģini vēlreiz.',
+    'welcome'                => 'Laipni lūgti!',
+    'use_sidebar'            => 'Izmantojiet sānjoslu pa kreisi, lai izveidotu, rediģētu vai izdzēstu saturu.',
 
     'password_reset' => [
         'greeting' => 'Labdien!',