From 36211e9ec7d11afe64ce26423f20bdfc4c2e892d Mon Sep 17 00:00:00 2001 From: Olivier Legat Date: Tue, 20 Apr 2021 13:17:58 +0200 Subject: [PATCH] DnD usability improved --- app/Http/Controllers/Bo/ProductsController.php | 1 + app/Http/Controllers/Bo/PromotionsController.php | 1 + public/b-o/css/app.css | 2 ++ resources/sass/smoothdnd.scss | 2 ++ 4 files changed, 6 insertions(+) diff --git a/app/Http/Controllers/Bo/ProductsController.php b/app/Http/Controllers/Bo/ProductsController.php index ef16cfa5..4dbaa0b7 100644 --- a/app/Http/Controllers/Bo/ProductsController.php +++ b/app/Http/Controllers/Bo/ProductsController.php @@ -191,6 +191,7 @@ class ProductsController extends Controller $existingProds = Product::all(); $selectedProds = $product->products; + $existingProds = $existingProds->diff($selectedProds); return view('bo.products.edit', compact('product', 'ranges','existingTags', 'selectedtags', 'existingProds', 'selectedProds')); } diff --git a/app/Http/Controllers/Bo/PromotionsController.php b/app/Http/Controllers/Bo/PromotionsController.php index 248cf1bc..4c35a305 100644 --- a/app/Http/Controllers/Bo/PromotionsController.php +++ b/app/Http/Controllers/Bo/PromotionsController.php @@ -85,6 +85,7 @@ class PromotionsController extends Controller $existingProds = Product::all(); $selectedProds = $promotion->products; + $existingProds = $existingProds->diff($selectedProds); return view('bo.promotions.edit', compact('promotion', 'discTypes', 'existingProds', 'selectedProds')); } diff --git a/public/b-o/css/app.css b/public/b-o/css/app.css index 129170e5..6477e9ba 100644 --- a/public/b-o/css/app.css +++ b/public/b-o/css/app.css @@ -17159,6 +17159,8 @@ body { } .smooth-dnd-container.pool { border: 1px solid #ccc; + display: block !important; + overflow: auto; } .smooth-dnd-container.pool .card { cursor: -webkit-grab; diff --git a/resources/sass/smoothdnd.scss b/resources/sass/smoothdnd.scss index 801bff14..7c29699e 100644 --- a/resources/sass/smoothdnd.scss +++ b/resources/sass/smoothdnd.scss @@ -2,6 +2,8 @@ margin: 1rem; &.pool { border: 1px solid #ccc; + display: block !important; + overflow: auto; .card { cursor: grab; max-height: 15rem;