Merge pull request #18036 from grokability/better-messaging-for-bulk-deletes

Fixed #18034 - Shows success message on partial bulk delete success

Author: snipe

app/Http/Controllers/BulkCategoriesController.php

@@ -19,6 +19,8 @@ public function destroy(Request $request)
         $this->authorize('delete', Category::class);
 
         $errors = [];
+        $success_count = 0;
+
         foreach ($request->ids as $id) {
             $category = Category::find($id);
             if (is_null($category)) {
@@ -27,6 +29,7 @@ public function destroy(Request $request)
             }
             try {
                 DestroyCategoryAction::run(category: $category);
+                $success_count++;
             } catch (ItemStillHasAccessories $e) {
                 $errors[] = trans('general.bulk_delete_associations.assoc_assets_no_count', ['item_name' => $category->name, 'item' => trans('general.category')]);
             } catch (ItemStillHasAssetModels) {
@@ -45,6 +48,9 @@ public function destroy(Request $request)
             }
         }
         if (count($errors) > 0) {
+            if ($success_count > 0) {
+                return redirect()->route('categories.index')->with('success', trans_choice('admin/categories/message.delete.partial_success', $success_count, ['count' => $success_count]))->with('multi_error_messages', $errors);
+            }
             return redirect()->route('categories.index')->with('multi_error_messages', $errors);
         } else {
             return redirect()->route('categories.index')->with('success', trans('admin/categories/message.delete.bulk_success'));

app/Http/Controllers/BulkManufacturersController.php

@@ -20,6 +20,7 @@ public function destroy(Request $request)
         $this->authorize('delete', Manufacturer::class);
 
         $errors = [];
+        $success_count = 0;
         foreach ($request->ids as $id) {
             $manufacturer = Manufacturer::find($id);
             if (is_null($manufacturer)) {
@@ -28,6 +29,7 @@ public function destroy(Request $request)
             }
             try {
                 DeleteManufacturerAction::run(manufacturer: $manufacturer);
+                $success_count++;
             } catch (ItemStillHasAssets $e) {
                 $errors[] = trans('general.bulk_delete_associations.assoc_assets_no_count', ['item_name' => $manufacturer->name, 'item' => trans('general.manufacturer')]);
             } catch (ItemStillHasAccessories $e) {
@@ -44,6 +46,9 @@ public function destroy(Request $request)
             }
         }
         if (count($errors) > 0) {
+            if ($success_count > 0) {
+                return redirect()->route('manufacturers.index')->with('success', trans_choice('admin/manufacturers/message.delete.partial_success', $success_count, ['count' => $success_count]))->with('multi_error_messages', $errors);
+            }
             return redirect()->route('manufacturers.index')->with('multi_error_messages', $errors);
         } else {
             return redirect()->route('manufacturers.index')->with('success', trans('admin/manufacturers/message.delete.bulk_success'));

app/Http/Controllers/BulkSuppliersController.php

@@ -19,6 +19,8 @@ public function destroy(Request $request)
         $this->authorize('delete', Supplier::class);
 
         $errors = [];
+        $success_count = 0;
+
         foreach ($request->ids as $id) {
             $supplier = Supplier::find($id);
             if (is_null($supplier)) {
@@ -45,6 +47,9 @@ public function destroy(Request $request)
             }
         }
         if (count($errors) > 0) {
+            if ($success_count > 0) {
+                return redirect()->route('suppliers.index')->with('success', trans_choice('admin/suppliers/message.delete.partial_success', $success_count, ['count' => $success_count]))->with('multi_error_messages', $errors);
+            }
             return redirect()->route('suppliers.index')->with('multi_error_messages', $errors);
         } else {
             return redirect()->route('suppliers.index')->with('success', trans('admin/suppliers/message.delete.bulk_success'));

resources/lang/en-US/admin/categories/message.php

@@ -20,8 +20,9 @@
     'delete' => array(
         'confirm'                => 'Are you sure you wish to delete this category?',
         'error'                  => 'There was an issue deleting the category. Please try again.',
-        'success'                => 'The category was deleted successfully.',
-        'bulk_success'           => 'The Categories were deleted successfully.',
+        'success'                => 'Category was deleted successfully.',
+        'bulk_success'           => 'Categories were deleted successfully.',
+        'partial_success'        => 'Category deleted successfully. See additional information below. | :count categories were deleted successfully. See additional information below.',
     )
 
 );

resources/lang/en-US/admin/manufacturers/message.php

@@ -24,8 +24,9 @@
     'delete' => array(
         'confirm' => 'Are you sure you wish to delete this manufacturer?',
         'error'   => 'There was an issue deleting the manufacturer. Please try again.',
-        'success'                => 'The Manufacturer was deleted successfully.',
-        'bulk_success'           => 'The Manufacturers were deleted successfully.',
+        'success'                => 'Manufacturer deleted successfully.',
+        'bulk_success'           => 'Manufacturers deleted successfully.',
+        'partial_success'        => 'Manufacturer deleted successfully. See additional information below. | :count manufacturers were deleted successfully. See additional information below.',
     )
 
 );

resources/lang/en-US/admin/suppliers/message.php

@@ -22,6 +22,7 @@
         'success' => 'Supplier was deleted successfully.',
         'not_found'               => 'Supplier not found.',
         'bulk_success'            => 'Suppliers were deleted successfully.',
+        'partial_success'        => 'Supplier deleted successfully. See additional information below. | :count suppliers were deleted successfully. See additional information below.',
     )
 
 );