Merge branch 'master' into fix-for-left-join-clauses

Author: tabacitu

src/app/Http/Controllers/Operations/FetchOperation.php

@@ -100,8 +100,11 @@ private function fetch($arg)
                         $tempQuery = $query->{$operation}($searchColumn, $search_string);
                     }
                 }
-
-                return $tempQuery;
+                // If developer provide an empty searchable_attributes array it means he don't want us to search
+                // in any specific column, or try to guess the column from model identifiableAttribute.
+                // In that scenario we will not have any $tempQuery here, so we just return the query, is up to the developer
+                // to do his own search.
+                return $tempQuery ?? $query;
             });
         } else {
             foreach ((array) $config['searchable_attributes'] as $k => $searchColumn) {

src/app/Http/Controllers/Operations/ListOperation.php

@@ -74,7 +74,7 @@ public function search()
         $this->crud->applyUnappliedFilters();
 
         $totalRows = $this->crud->model->count();
-        $filteredRows = $this->crud->count();
+        $filteredRows = $this->crud->query->toBase()->getCountForPagination();
         $startIndex = request()->input('start') ?: 0;
         // if a search term was present
         if (request()->input('search') && request()->input('search')['value']) {

src/resources/lang/en/base.php

@@ -48,7 +48,7 @@
     'password_empty'         => 'Make sure both password fields are filled out.',
     'password_updated'       => 'Password updated.',
     'account_updated'        => 'Account updated successfully.',
-    'unknown_error'          => 'An unknown error has occured. Please try again.',
+    'unknown_error'          => 'An unknown error has occurred. Please try again.',
     'error_saving'           => 'Error while saving. Please try again.',
     'welcome'                => 'Welcome!',
     'use_sidebar'            => 'Use the sidebar to the left to create, edit or delete content.',

src/resources/lang/id/crud.php

@@ -17,6 +17,7 @@
     'save_action_save_and_new'         => 'Simpan dan buat baru',
     'save_action_save_and_edit'        => 'Simpan dan lanjutkan perubahan',
     'save_action_save_and_back'        => 'Simpan dan kembali',
+    'save_action_save_and_preview'     => 'Simpan dan lihat',
     'save_action_changed_notification' => 'Perilaku default setelah penyimpanan diubah.',
 
     // Create form
@@ -37,15 +38,16 @@
     'all'                       => 'Semua ',
     'in_the_database'           => 'di database',
     'list'                      => 'Daftar',
+    'reset'                     => 'Set ulang',
     'actions'                   => 'Aksi',
     'preview'                   => 'Lihat',
     'delete'                    => 'Hapus',
     'admin'                     => 'Admin',
     'details_row'               => 'Ini adalah baris rincian. Ubah sesuka Anda.',
     'details_row_loading_error' => 'Terjadi kesalahan saat memuat detail. Silakan coba lagi.',
     'clone'                     => 'Duplikat',
-    'clone_success'             => '<strong>Entri telah diduplikat</strong><br>Entri baru telah ditambahkan, dengan informasi yang sama.',
-    'clone_failure'             => '<strong>Proses duplikat gagal</strong><br>Entri baru tidak dapat dibuat. Silakan coba lagi.',
+    'clone_success'             => '<strong>Masukan telah diduplikat</strong><br>Masukan baru telah ditambahkan, dengan informasi yang sama.',
+    'clone_failure'             => '<strong>Proses duplikat gagal</strong><br>Masukan baru tidak dapat dibuat. Silakan coba lagi.',
 
     // Confirmation messages and bubbles
     'delete_confirm'                              => 'Anda yakin ingin menghapus item ini?',
@@ -57,7 +59,7 @@
     'delete_confirmation_not_deleted_message'     => 'Tidak ada yang terjadi. Item Anda aman.',
 
     // Bulk actions
-    'bulk_no_entries_selected_title'   => 'Tidak ada entri yang dipilih',
+    'bulk_no_entries_selected_title'   => 'Tidak ada masukan yang dipilih',
     'bulk_no_entries_selected_message' => 'Silakan pilih satu atau lebih untuk melakukan tindakan massal pada mereka.',
 
     // Bulk confirmation
@@ -73,8 +75,8 @@
 
     // DataTables translation
     'emptyTable'     => 'Tak ada data yang tersedia pada tabel ini',
-    'info'           => 'Menampilkan _START_ dari _END_ dari _TOTAL_ masukan',
-    'infoEmpty'      => '',
+    'info'           => 'Menampilkan _START_ hingga _END_ dari _TOTAL_ masukan',
+    'infoEmpty'      => 'Tidak ada masukan',
     'infoFiltered'   => '(difilter dari _MAX_ jumlah masukan)',
     'infoPostFix'    => '.',
     'thousands'      => ',',
@@ -140,11 +142,18 @@
     'internal_link_placeholder' => 'Slug internal. Cth: \'admin/page\' (tanpa tanda kutip) untuk \':url\'',
     'external_link'             => 'Tautan eksternal',
     'choose_file'               => 'Pilih File',
+    'new_item'                  => 'Item baru',
+    'select_entry'              => 'Pilih masukan',
+    'select_entries'            => 'Pilih masukan',
 
     //Table field
     'table_cant_add'    => 'Tidak dapat menambahkan :entity yang baru',
     'table_max_reached' => 'Jumlah maksimum :max telah tercapai',
 
     // File manager
     'file_manager' => 'Manajer File',
+
+    // InlineCreateOperation
+    'related_entry_created_success' => 'Masukan terkait telah dibuat dan dipilih.',
+    'related_entry_created_error' => 'Tidak dapat membuat masukan terkait.',
 ];

src/resources/lang/it/base.php

@@ -9,6 +9,7 @@
     */
 
     'registration_closed'    => 'Le registrazioni sono chiuse.',
+    'no_email_column'        => 'Gli utenti non hanno un indirizzo email associato.',
     'first_page_you_see'     => 'La prima pagina che vedi dopo il login',
     'login_status'           => 'Stato autenticazione',
     'logged_in'              => 'Sei autenticato!',
@@ -29,8 +30,8 @@
     'reset_password'         => 'Reimposta password',
     'send_reset_link'        => 'Invia link di reset',
     'click_here_to_reset'    => 'Clicca qui per reimpostare la tua password',
-    'unauthorized'           => 'Non autorizzato.',
     'change_password'        => 'Cambia Password',
+    'unauthorized'           => 'Non autorizzato.',
     'dashboard'              => 'Dashboard',
     'handcrafted_by'         => 'Realizzato da',
     'powered_by'             => 'Creato con',
@@ -40,11 +41,29 @@
     'cancel'                 => 'Annulla',
     'error'                  => 'Errore',
     'success'                => 'Operazione eseguita con successo',
+    'warning'                => 'Avvertimento',
+    'notice'                 => 'Avviso',
     'old_password_incorrect' => 'La vecchia password non è corretta.',
     'password_dont_match'    => 'Le password non corrispondono.',
     'password_empty'         => 'Accertati di aver riempito entrambi i campi password.',
     'password_updated'       => 'Password aggiornata.',
     'account_updated'        => 'Account aggiornato con successo.',
     'unknown_error'          => 'Si è verificato un errore sconosciuto. Riprova più tardi.',
     'error_saving'           => 'Errore durante il salvataggio. Riprova più tardi.',
+    'welcome'                => 'Benvenuto!',
+    'use_sidebar'            => 'Utilizza la barra laterale per creare, modificare od eliminare contenuti.',
+
+    'password_reset' => [
+        'greeting' => 'Ciao!',
+        'subject'  => 'Notifica di reset della password',
+        'line_1'   => 'Stai ricevendo questa e-mail in quanto abbiamo ricevuto una richiesta di reset della password dal tuo account.',
+        'line_2'   => 'Clicca il pulsante qui sotto per reimpostare la tua password:',
+        'button'   => 'Reimposta Password',
+        'notice'   => 'Se tu non hai richiesto il reset della password, non è necessaria nessun\'altra azione.',
+    ],
+
+    'step'                 => 'Passo',
+    'confirm_email'        => 'Conferma E-mail',
+    'choose_new_password'  => 'Scegli una nuova password',
+    'confirm_new_password' => 'Conferma la nuova password',
 ];

src/resources/lang/it/crud.php

@@ -17,32 +17,37 @@
     'save_action_save_and_new'         => 'Salva ed aggiungi un nuovo elemento',
     'save_action_save_and_edit'        => 'Salva e modifica questo elemento',
     'save_action_save_and_back'        => 'Salva e torna indietro',
+    'save_action_save_and_preview'     => 'Salva e vai all\'anteprima',
     'save_action_changed_notification' => 'Azione predefinita cambiata',
 
     // Create form
     'add'                 => 'Aggiungi',
-    'back_to_all'         => 'Torna a tutti i ',
+    'back_to_all'         => 'Torna alla lista di ',
     'cancel'              => 'Annulla',
-    'add_a_new'           => 'Aggiungi un nuovo ',
+    'add_a_new'           => 'Aggiungi nuovo/a ',
 
     // Edit form
     'edit'                 => 'Modifica',
     'save'                 => 'Salva',
 
     // Translatable models
-    'edit_translations' => 'MODIFICA TRADUZIONI',
+    'edit_translations' => 'Modifica traduzioni',
     'language'          => 'Lingua',
 
     // CRUD table view
     'all'                       => 'Tutti i ',
     'in_the_database'           => 'nel database',
     'list'                      => 'Lista',
+    'reset'                     => 'Reimposta',
     'actions'                   => 'Azioni',
     'preview'                   => 'Anteprima',
     'delete'                    => 'Elimina',
     'admin'                     => 'Amministrazione',
     'details_row'               => 'Questa è la riga dei dettagli. Modificala a tuo piacimento.',
     'details_row_loading_error' => "C'è stato un errore caricando i dettagli. Riprova.",
+    'clone' => 'Duplica',
+    'clone_success' => '<strong>Elemento duplicato</strong><br>Un nuovo elemento è stato creato con le stesse informazioni di questo.',
+    'clone_failure' => '<strong>Duplicazione fallita</strong><br>Il nuovo elemento non può essere creato. Per favore, riprova.',
 
     // Confirmation messages and bubbles
     'delete_confirm'                              => 'Sei sicuro di eliminare questo elemento?',
@@ -55,7 +60,7 @@
 
     // Bulk actions
     'bulk_no_entries_selected_title'   => 'Nessun record selezionato',
-    'bulk_no_entries_selected_message' => 'Seleziona uno o più record su cui effetturare l\'operaione.',
+    'bulk_no_entries_selected_message' => 'Seleziona uno o più record su cui effettuare l\'operazione.',
 
     // Bulk confirmation
     'bulk_delete_are_you_sure'   => 'Sei sicuro di voler eliminare :number record?',
@@ -64,16 +69,17 @@
     'bulk_delete_error_title'    => 'Record non eliminati',
     'bulk_delete_error_message'  => 'Non è stato possibile eliminare uno o più record',
 
+    // Ajax errors
     'ajax_error_title' => 'Errore',
     'ajax_error_text'  => 'Errore durante il caricamento della pagina. Per favore ricarica la pagina.',
 
     // DataTables translation
     'emptyTable'     => 'Nessun record da visualizzare',
     'info'           => 'Visualizzando da _START_ a _END_ record di _TOTAL_',
-    'infoEmpty'      => '',
+    'infoEmpty'      => 'Non vi sono elementi',
     'infoFiltered'   => '(filtrati da _MAX_ record totali)',
-    'infoPostFix'    => '.',
-    'thousands'      => ',',
+    'infoPostFix'    => ',',
+    'thousands'      => '.',
     'lengthMenu'     => '_MENU_ record per pagina',
     'loadingRecords' => 'Caricamento...',
     'processing'     => 'Elaborazione...',
@@ -136,11 +142,18 @@
     'internal_link_placeholder' => 'Slug interno. Es: \'admin/page\' (no quotes) for \':url\'',
     'external_link'             => 'Link Esterno',
     'choose_file'               => 'Scegli file',
+    'new_item'                  => 'Nuovo elemento',
+    'select_entry'              => 'Seleziona un elemento',
+    'select_entries'            => 'Select degli elementi',
 
     //Table field
     'table_cant_add'    => 'Impossibile aggiungere una nuova :entity',
     'table_max_reached' => 'Numero massimo di :max raggiunto',
 
     // File manager
     'file_manager' => 'File Manager',
+
+    // InlineCreateOperation
+    'related_entry_created_success' => 'L\'elemento correlato è stato creato e selezionato.',
+    'related_entry_created_error' => 'Non è possibile creare elementi correlati.',
 ];

src/resources/views/base/inc/footer.blade.php

@@ -1,10 +1,10 @@
 @if (config('backpack.base.show_powered_by') || config('backpack.base.developer_link'))
     <div class="text-muted ml-auto mr-auto">
       @if (config('backpack.base.developer_link') && config('backpack.base.developer_name'))
-      {{ trans('backpack::base.handcrafted_by') }} <a target="_blank" href="{{ config('backpack.base.developer_link') }}">{{ config('backpack.base.developer_name') }}</a>.
+      {{ trans('backpack::base.handcrafted_by') }} <a target="_blank" rel="noopener" href="{{ config('backpack.base.developer_link') }}">{{ config('backpack.base.developer_name') }}</a>.
       @endif
       @if (config('backpack.base.show_powered_by'))
-      {{ trans('backpack::base.powered_by') }} <a target="_blank" href="http://backpackforlaravel.com?ref=panel_footer_link">Backpack for Laravel</a>.
+      {{ trans('backpack::base.powered_by') }} <a target="_blank" rel="noopener" href="http://backpackforlaravel.com?ref=panel_footer_link">Backpack for Laravel</a>.
       @endif
     </div>
 @endif

src/resources/views/base/inc/main_header.blade.php

@@ -1,12 +1,12 @@
 <header class="{{ config('backpack.base.header_class') }}">
   <!-- Logo -->
-  <button class="navbar-toggler sidebar-toggler d-lg-none mr-auto ml-3" type="button" data-toggle="sidebar-show">
+  <button class="navbar-toggler sidebar-toggler d-lg-none mr-auto ml-3" type="button" data-toggle="sidebar-show" aria-label="{{ trans('backpack::base.toggle_navigation')}}">
     <span class="navbar-toggler-icon"></span>
   </button>
-  <a class="navbar-brand" href="{{ url(config('backpack.base.home_link')) }}">
+  <a class="navbar-brand" href="{{ url(config('backpack.base.home_link')) }}" title="{{ config('backpack.base.project_name') }}">
     {!! config('backpack.base.project_logo') !!}
   </a>
-  <button class="navbar-toggler sidebar-toggler d-md-down-none" type="button" data-toggle="sidebar-lg-show">
+  <button class="navbar-toggler sidebar-toggler d-md-down-none" type="button" data-toggle="sidebar-lg-show" aria-label="{{ trans('backpack::base.toggle_navigation')}}">
     <span class="navbar-toggler-icon"></span>
   </button>
 

src/resources/views/crud/columns/image.blade.php

@@ -1,27 +1,29 @@
 {{-- image column type --}}
 @php
   $value = data_get($entry, $column['name']);
+  
+  if($value) {
+    $column['height'] = $column['height'] ?? "25px";
+    $column['width'] = $column['width'] ?? "auto";
+    $column['radius'] = $column['radius'] ?? "3px";
+    $column['prefix'] = $column['prefix'] ?? '';
 
-  $column['height'] = $column['height'] ?? "25px";
-  $column['width'] = $column['width'] ?? "auto";
-  $column['radius'] = $column['radius'] ?? "3px";
-  $column['prefix'] = $column['prefix'] ?? '';
+    if (is_array($value)) {
+      $value = json_encode($value);
+    }
 
-  if (is_array($value)) {
-    $value = json_encode($value);
-  }
+    if (preg_match('/^data\:image\//', $value)) { // base64_image
+      $href = $src = $value;
+    } elseif (isset($column['disk'])) { // image from a different disk (like s3 bucket)
+      $href = $src = Storage::disk($column['disk'])->url($column['prefix'].$value);
+    } else { // plain-old image, from a local disk
+      $href = $src = asset( $column['prefix'] . $value);
+    }
 
-  if (preg_match('/^data\:image\//', $value)) { // base64_image
-    $href = $src = $value;
-  } elseif (isset($column['disk'])) { // image from a different disk (like s3 bucket)
-    $href = $src = Storage::disk($column['disk'])->url($column['prefix'].$value);
-  } else { // plain-old image, from a local disk
-    $href = $src = asset( $column['prefix'] . $value);
+    $column['wrapper']['element'] = $column['wrapper']['element'] ?? 'a';
+    $column['wrapper']['href'] = $column['wrapper']['href'] ?? $href;
+    $column['wrapper']['target'] = $column['wrapper']['target'] ?? '_blank';
   }
-
-  $column['wrapper']['element'] = $column['wrapper']['element'] ?? 'a';
-  $column['wrapper']['href'] = $column['wrapper']['href'] ?? $href;
-  $column['wrapper']['target'] = $column['wrapper']['target'] ?? '_blank';
 @endphp
 
 <span>

src/resources/views/crud/fields/relationship/fetch.blade.php

@@ -186,7 +186,7 @@ function bpFieldInitFetchElement(element) {
         var $dependencies = JSON.parse(element.attr('data-dependencies'));
         var $allows_null = element.attr('data-column-nullable') == 'true' ? true : false;
         var $appLang = element.attr('data-app-current-lang');
-        var $selectedOptions = JSON.parse(element.attr('data-selected-options') ?? null);
+        var $selectedOptions = typeof element.attr('data-selected-options') === 'string' ? JSON.parse(element.attr('data-selected-options')) : JSON.parse(null);
         var $multiple = element.prop('multiple');
 
         var FetchAjaxFetchSelectedEntry = function (element) {