Merge pull request #10165 from snipe/fixes/set_restore_actions_to_POS…

…T_requests

Set restore actions to POST requests instead of GET

app/Http/Controllers/Api/AssetModelsController.php

@@ -67,7 +67,7 @@ public function index(Request $request)
 
 
 
-        if ($request->filled('status')) {
+        if ($request->input('status')=='deleted') {
             $assetmodels->onlyTrashed();
         }
 

app/Http/Controllers/Assets/BulkAssetsController.php

@@ -32,7 +32,8 @@ public function edit(Request $request)
             return redirect()->back()->with('error', 'No assets selected');
         }
 
-        $asset_ids = array_keys($request->input('ids'));
+
+        $asset_ids = array_values(array_unique($request->input('ids')));
 
         if ($request->filled('bulk_actions')) {
             switch($request->input('bulk_actions')) {
@@ -50,7 +51,7 @@ public function edit(Request $request)
                     return view('hardware/bulk-delete')->with('assets', $assets);
                 case 'edit':
                     return view('hardware/bulk')
-                        ->with('assets', request('ids'))
+                        ->with('assets', $asset_ids)
                         ->with('statuslabel_list', Helper::statusLabelList());
             }
         }
@@ -90,6 +91,7 @@ public function update(Request $request)
             || ($request->filled('model_id'))
         ) {
             foreach ($assets as $assetId) {
+
                 $this->update_array = [];
 
                 $this->conditionallyAddItem('purchase_date')

app/Http/Transformers/AssetsTransformer.php

@@ -116,7 +116,7 @@ public function transformAsset(Asset $asset)
         $permissions_array['available_actions'] = [
             'checkout' => Gate::allows('checkout', Asset::class),
             'checkin' => Gate::allows('checkin', Asset::class),
-            'clone' => Gate::allows('create', Asset::class),
+            'clone' => false,
             'restore' => false,
             'update' => (bool) Gate::allows('update', Asset::class),
             'delete' => ($asset->assigned_to=='' && Gate::allows('delete', Asset::class)),

resources/lang/af/admin/depreciations/general.php

@@ -8,5 +8,6 @@
     'depreciation_name'  					=> 'Waardevermindering Naam',
     'number_of_months'  					=> 'Aantal maande',
     'update'  					            => 'Werk waardevermindering op',
+    'depreciation_min'                      => 'Minimum Value after Depreciation'
 
 );

resources/lang/af/admin/hardware/general.php

@@ -10,9 +10,9 @@
     'checkout'  				=> 'Checkout Asset',
     'clone'  					=> 'Klone Bate',
     'deployable'  				=> 'verbintenis',
-    'deleted'  					=> 'Hierdie bate is verwyder. <a href="/hardware/:asset_id/restore">Klik hier om dit te herstel</a>.',
+    'deleted'  					=> 'This asset has been deleted.',
     'edit'  					=> 'Wysig bate',
-    'model_deleted'  			=> 'Hierdie batesmodel is uitgevee. Jy moet die model herstel voordat jy die Bate kan herstel. <br/> <a href="/hardware/models/:model_id/restore">Klik hier om die model</a> te herstel.',
+    'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
     'requestable'               => 'Requestable',
     'requested'				    => 'versoek',
     'restore'  					=> 'Herstel bate',

resources/lang/af/admin/models/general.php

@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'Oor Asset Models',
     'about_models_text'           => 'Batemodelle is \'n manier om identiese bates te groepeer. "MBP 2013", "IPhone 6s", ens.',
-    'deleted'  					        => 'Hierdie model is verwyder. <a href="/hardware/models/:model_id/restore">Klik hier om dit te herstel</a>.',
+    'deleted'  					        => 'This model has been deleted.',
     'bulk_delete'               => 'Bulk Delete Asset Models',
     'bulk_delete_help'               => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.',
     'bulk_delete_warn'          => 'You are about to delete :model_count asset models.',

resources/lang/af/general.php

@@ -176,6 +176,7 @@
     'remove_company'        => 'Verwyder Maatskappyvereniging',
     'reports'				=> 'Berigte',
     'restored'				=> 'restored',
+    'restore'				=> 'Restore',
     'requested'				=> 'versoek',
     'request_canceled'      => 'Versoek gekanselleer',
     'save'  				=> 'Save',

resources/lang/am/admin/depreciations/general.php

@@ -8,5 +8,6 @@
     'depreciation_name'  					=> 'Depreciation Name',
     'number_of_months'  					=> 'Number of Months',
     'update'  					            => 'Update Depreciation',
+    'depreciation_min'                      => 'Minimum Value after Depreciation'
 
 );

resources/lang/am/admin/hardware/general.php

@@ -10,9 +10,9 @@
     'checkout'  				=> 'Checkout Asset',
     'clone'  					=> 'Clone Asset',
     'deployable'  				=> 'Deployable',
-    'deleted'  					=> 'This asset has been deleted. <a href="/hardware/:asset_id/restore">Click here to restore it</a>.',
+    'deleted'  					=> 'This asset has been deleted.',
     'edit'  					=> 'Edit Asset',
-    'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.<br/> <a href="/hardware/models/:model_id/restore">Click here to restore the model</a>.',
+    'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
     'requestable'               => 'Requestable',
     'requested'				    => 'Requested',
     'restore'  					=> 'Restore Asset',

resources/lang/am/admin/models/general.php

@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'About Asset Models',
     'about_models_text'           => 'Asset Models are a way to group identical assets. "MBP 2013", "IPhone 6s", etc.',
-    'deleted'  					        => 'This model has been deleted. <a href="/hardware/models/:model_id/restore">Click here to restore it</a>.',
+    'deleted'  					        => 'This model has been deleted.',
     'bulk_delete'               => 'Bulk Delete Asset Models',
     'bulk_delete_help'               => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.',
     'bulk_delete_warn'          => 'You are about to delete :model_count asset models.',

resources/lang/am/general.php

@@ -176,6 +176,7 @@
     'remove_company'        => 'Remove Company Association',
     'reports'				=> 'Reports',
     'restored'				=> 'restored',
+    'restore'				=> 'Restore',
     'requested'				=> 'Requested',
     'request_canceled'      => 'Request Canceled',
     'save'  				=> 'Save',

resources/lang/ar/admin/depreciations/general.php

@@ -8,5 +8,6 @@
     'depreciation_name'  					=> 'اسم الاستهلاك',
     'number_of_months'  					=> 'عدد الأشهر',
     'update'  					            => 'تحديث الاستهلاك',
+    'depreciation_min'                      => 'Minimum Value after Depreciation'
 
 );

resources/lang/ar/admin/hardware/general.php

@@ -10,9 +10,9 @@
     'checkout'  				=> 'اخراج الأصل',
     'clone'  					=> 'استنساخ الأصل',
     'deployable'  				=> 'قابل للتوزيع',
-    'deleted'  					=> 'تم حذف هذا الأصل. <a href="/hardware/:asset_id/restore"> انقر هنا لاستعادته </a>.',
+    'deleted'  					=> 'This asset has been deleted.',
     'edit'  					=> 'تعديل الأصل',
-    'model_deleted'  			=> 'تم حذف موديل الأصل هذا. يجب عليك استعادة الموديل قبل أن تتمكن من استعادة الأصل.<br/> <a href="/hardware/models/:model_id/restore"> انقر هنا لاستعادة الموديل</a>.',
+    'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
     'requestable'               => 'قابل للطلب',
     'requested'				    => 'تم الطلب',
     'restore'  					=> 'استعادة الأصل',

resources/lang/ar/admin/models/general.php

@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'حول موديلات الأصول',
     'about_models_text'           => 'موديلات الأصول هي طريقة لتجميع الأصول المتطابقة "MBP 2013", "IPhone 6s", الخ.',
-    'deleted'  					        => 'تم حذف هذا الموديل. <a href="/hardware/models/:model_id/restore"> انقر هنا لاستعادته </a>.',
+    'deleted'  					        => 'This model has been deleted.',
     'bulk_delete'               => 'حذف موديلات الاصول بالجملة',
     'bulk_delete_help'               => 'استخدم مربعات الاختيار أدناه لتأكيد حذف موديلات الأصول المحددة. لا يمكن حذف موديلات الأصول التي تحتوي على أصول مرتبطة بها إلى أن يتم ربط الأصول بموديل مختلف.',
     'bulk_delete_warn'          => 'أنت على وشك حذف :model_count من موديلات الأصول.',

resources/lang/ar/general.php

@@ -176,6 +176,7 @@
     'remove_company'        => 'إزالة جمعية الشركة',
     'reports'				=> 'التقارير',
     'restored'				=> 'المعاد',
+    'restore'				=> 'Restore',
     'requested'				=> 'طلب',
     'request_canceled'      => 'تم إلغاء الطلب',
     'save'  				=> 'حفظ',

resources/lang/bg/admin/depreciations/general.php

@@ -8,5 +8,6 @@
     'depreciation_name'  					=> 'Амортизация',
     'number_of_months'  					=> 'Брой месеци',
     'update'  					            => 'Обновяване на амортизация',
+    'depreciation_min'                      => 'Minimum Value after Depreciation'
 
 );

resources/lang/bg/admin/hardware/general.php

@@ -10,9 +10,9 @@
     'checkout'  				=> 'Проверка на активите',
     'clone'  					=> 'Копиране на актив',
     'deployable'  				=> 'Може да бъде предоставен',
-    'deleted'  					=> 'Активът беше изтрит. <a href="/hardware/:asset_id/restore">Възстановяване</a>.',
+    'deleted'  					=> 'This asset has been deleted.',
     'edit'  					=> 'Редакция на актив',
-    'model_deleted'  			=> 'Моделът актив беше изтрит.Необходимо е да възстановите моделът, преди да възстановите актива.<br/> <a href="/hardware/models/:model_id/restore">Възстановяване на модел</a>.',
+    'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
     'requestable'               => 'Може да бъде изискван',
     'requested'				    => 'Изискан',
     'restore'  					=> 'Възстановяване на актив',

resources/lang/bg/admin/models/general.php

@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'Относно модели на актив',
     'about_models_text'           => 'Модели на актив са начин за групиране на идентични активи. "MBP 2013", "IPhone 6s" и др.',
-    'deleted'  					        => 'Моделът беше изтрит. <a href="/hardware/models/:model_id/restore">Възстановяване</a>.',
+    'deleted'  					        => 'This model has been deleted.',
     'bulk_delete'               => 'Масово изтриване на модели на активите',
     'bulk_delete_help'               => 'Използвайте квадратчетата за отметка по-долу, за да потвърдите изтриването на избраните модели на активи. Моделите, за които има асоциирани активи, не могат да бъдат изтрити, докато активите не се асоциират с друг модел.',
     'bulk_delete_warn'          => 'Ще бъдат изтрити :model_count модели на активи.',

resources/lang/bg/general.php

@@ -176,6 +176,7 @@
     'remove_company'        => 'Премахване на асоциация към компания',
     'reports'				=> 'Справки',
     'restored'				=> 'възстановени',
+    'restore'				=> 'Restore',
     'requested'				=> 'Изискан',
     'request_canceled'      => 'Заявка отменена',
     'save'  				=> 'Запис',

resources/lang/ca/admin/depreciations/general.php

@@ -8,5 +8,6 @@
     'depreciation_name'  					=> 'Depreciation Name',
     'number_of_months'  					=> 'Number of Months',
     'update'  					            => 'Update Depreciation',
+    'depreciation_min'                      => 'Minimum Value after Depreciation'
 
 );

resources/lang/ca/admin/hardware/general.php

@@ -10,9 +10,9 @@
     'checkout'  				=> 'Checkout Asset',
     'clone'  					=> 'Clone Asset',
     'deployable'  				=> 'Deployable',
-    'deleted'  					=> 'This asset has been deleted. <a href="/hardware/:asset_id/restore">Click here to restore it</a>.',
+    'deleted'  					=> 'This asset has been deleted.',
     'edit'  					=> 'Edit Asset',
-    'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.<br/> <a href="/hardware/models/:model_id/restore">Click here to restore the model</a>.',
+    'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
     'requestable'               => 'Requestable',
     'requested'				    => 'Requested',
     'restore'  					=> 'Restore Asset',

resources/lang/ca/admin/models/general.php

@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'About Asset Models',
     'about_models_text'           => 'Asset Models are a way to group identical assets. "MBP 2013", "IPhone 6s", etc.',
-    'deleted'  					        => 'This model has been deleted. <a href="/hardware/models/:model_id/restore">Click here to restore it</a>.',
+    'deleted'  					        => 'This model has been deleted.',
     'bulk_delete'               => 'Bulk Delete Asset Models',
     'bulk_delete_help'               => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.',
     'bulk_delete_warn'          => 'You are about to delete :model_count asset models.',

resources/lang/ca/general.php

@@ -176,6 +176,7 @@
     'remove_company'        => 'Remove Company Association',
     'reports'				=> 'Reports',
     'restored'				=> 'restored',
+    'restore'				=> 'Restore',
     'requested'				=> 'Requested',
     'request_canceled'      => 'Request Canceled',
     'save'  				=> 'Save',

resources/lang/cs/admin/depreciations/general.php

@@ -8,5 +8,6 @@
     'depreciation_name'  					=> 'Jméno amortizace',
     'number_of_months'  					=> 'Počet měsíců',
     'update'  					            => 'Aktualizovat amortizaci',
+    'depreciation_min'                      => 'Minimum Value after Depreciation'
 
 );

resources/lang/cs/admin/hardware/general.php

@@ -10,9 +10,9 @@
     'checkout'  				=> 'Pokladní majetek',
     'clone'  					=> 'Klonovat majetek',
     'deployable'  				=> 'Připraveno k nasazení',
-    'deleted'  					=> 'Toto zařízení bylo odstraněno. <a href="/hardware/:asset_id/restore">Klepněte zde pro jeho obnovení</a>.',
+    'deleted'  					=> 'This asset has been deleted.',
     'edit'  					=> 'Upravit majetek',
-    'model_deleted'  			=> 'Tento model majetku byl odstraněn. Přejete-li si obnovit zařízení, <a href="/hardware/models/:model_id/restore">klepněte zde</a><br/> a obnovte nejdříve jeho model.',
+    'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
     'requestable'               => 'Lze vyžádat',
     'requested'				    => 'Požadováno',
     'restore'  					=> 'Obnovit zařízení',

resources/lang/cs/admin/models/general.php

@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'O modelech majetku',
     'about_models_text'           => 'Modely majetku jsou způsoby seskupení shodných majetků. "MBP 2013", "iPhone 6s" atd.',
-    'deleted'  					        => 'Model byl vymazán. <a href="/hardware/models/:model_id/restore">Klikněte sem pro jeho obnovení</a>.',
+    'deleted'  					        => 'This model has been deleted.',
     'bulk_delete'               => 'Hromadné mazání modelů majetku',
     'bulk_delete_help'               => 'Pomocí zaškrtávacích kolonek potvrďte smazání označených modelů majetku. Modely majetku, ke kterým je přiřazen majetek nemohou být smazány dokud jim přiřazený majetek nebude přeřazen k jinému modulu.',
     'bulk_delete_warn'          => 'Chystáte se smazat :model_count asset models.',

resources/lang/cs/general.php

@@ -176,6 +176,7 @@
     'remove_company'        => 'Odstraňte sdružení společnosti',
     'reports'				=> 'Reporty',
     'restored'				=> 'obnoveno',
+    'restore'				=> 'Restore',
     'requested'				=> 'Požadováno',
     'request_canceled'      => 'Žádost zrušena',
     'save'  				=> 'Uložit',

resources/lang/cy/admin/depreciations/general.php

@@ -8,5 +8,6 @@
     'depreciation_name'  					=> 'Enw Dibrisiant',
     'number_of_months'  					=> 'Nifer o Fisoedd',
     'update'  					            => 'Diweddaru Dibrisiant',
+    'depreciation_min'                      => 'Minimum Value after Depreciation'
 
 );

resources/lang/cy/admin/hardware/general.php

@@ -10,9 +10,9 @@
     'checkout'  				=> 'Nodi Asedau Allan',
     'clone'  					=> 'Dyblygu Ased',
     'deployable'  				=> 'Gellir ei ddefnyddio',
-    'deleted'  					=> 'Mae\'r ased yma wedi dileu. <a href="/hardware/:asset_id/restore">Cliciwch yma i\'w adfer</a>.',
+    'deleted'  					=> 'This asset has been deleted.',
     'edit'  					=> 'Addasu Ased',
-    'model_deleted'  			=> 'Mae\'r model yma o ased wedi\'i dileu. Rhaid i chi adfer y model cyn fedrwch chi adfer y\'r ased. <br/> <a href="/hardware/models/:model_id/restore">Cliciwch yma i adfer yr ased</a>.',
+    'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
     'requestable'               => 'Ar gael',
     'requested'				    => 'Gofynnwyd amdano',
     'restore'  					=> 'Adfer Ased',

resources/lang/cy/admin/models/general.php

@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'Amdan Modelau',
     'about_models_text'           => 'Mae modelau o asedau yn ffordd o creu grwp o asedau. "iPhone 7, Samsung TAB 4, ayyb.',
-    'deleted'  					        => 'Mae\'r model yma wedi dileu. <a href="/hardware/models/:model_id/restore">Cliciwch yma i\'w adfer</a>.',
+    'deleted'  					        => 'This model has been deleted.',
     'bulk_delete'               => 'Dileu Nifer o Modelau',
     'bulk_delete_help'               => 'Rhowch tic yn y bocsys isod i cadarnhau dileu y model. Nid oes modd dileu modelau sydd hefo asedau yn ei erbyn.',
     'bulk_delete_warn'          => 'Rydych am dileu :model_count o asedau.',

resources/lang/cy/general.php

@@ -176,6 +176,7 @@
     'remove_company'        => 'Dileu Cymdeithas y Cwmni',
     'reports'				=> 'Adroddiadau',
     'restored'				=> 'wedi adfer',
+    'restore'				=> 'Restore',
     'requested'				=> 'Gofynnwyd amdano',
     'request_canceled'      => 'Cais wedi dileu',
     'save'  				=> 'Cadw',

resources/lang/da/admin/depreciations/general.php

@@ -8,5 +8,6 @@
     'depreciation_name'  					=> 'Afskrivningnavn',
     'number_of_months'  					=> 'Antal måneder',
     'update'  					            => 'Opdater Afskrivninger',
+    'depreciation_min'                      => 'Minimum Value after Depreciation'
 
 );

resources/lang/da/admin/hardware/general.php

@@ -10,9 +10,9 @@
     'checkout'  				=> 'Checkout Asset',
     'clone'  					=> 'Klonaktiver',
     'deployable'  				=> 'Deployable',
-    'deleted'  					=> 'Dette aktiv er blevet slettet. <a href="/hardware/:asset_id/restore">Klik her for at gendanne det</a>.',
+    'deleted'  					=> 'This asset has been deleted.',
     'edit'  					=> 'Rediger aktiv',
-    'model_deleted'  			=> 'Denne aktivmodel er blevet slettet. Du skal gendanne modellen, før du kan gendanne Asset.<br/> <a href="/hardware/models/:model_id/restore">Klik her for at gendanne model</a>.',
+    'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
     'requestable'               => 'kan anmodes',
     'requested'				    => 'Anmodet',
     'restore'  					=> 'Gendan aktiv',

resources/lang/da/admin/models/general.php

@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'Om aktiv modeller',
     'about_models_text'           => 'Aktiv modeller er en måde at gruppere identiske aktiver. "MBP 2013", "IPhone 6s", osv.',
-    'deleted'  					        => 'Denne model er blevet slettet. <a href="/hardware/models/:model_id/restore"> Klik her for at gendanne den</a>.',
+    'deleted'  					        => 'This model has been deleted.',
     'bulk_delete'               => 'Slet flere aktivmodeller',
     'bulk_delete_help'               => 'Brug checkboksene nedenfor til at bekræfte sletning af valgte aktivmodeller. Aktivmodeller med tilknyttede aktiver kan ikke slettes før aktivet er knyttet til en anden model.',
     'bulk_delete_warn'          => 'Du er ved at slette :model_count aktivmodeller.',