From 326a77ed10e632cb82a9b1b7c31c58961f5a0058 Mon Sep 17 00:00:00 2001 From: Vlad0n20 Date: Tue, 26 Aug 2025 17:04:20 +0300 Subject: [PATCH 1/2] Fix color picker for brands --- admin/brands/views.py | 8 ++++++++ admin/static/js/banners/banners.js | 5 ++++- admin/static/js/brands/brands.js | 5 ++++- admin/webpack.prod.config.js | 2 +- 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/admin/brands/views.py b/admin/brands/views.py index 11473f86939..82d8a07090a 100644 --- a/admin/brands/views.py +++ b/admin/brands/views.py @@ -60,6 +60,14 @@ class BrandChangeForm(PermissionRequiredMixin, UpdateView): raise_exception = True model = Brand form_class = BrandForm + template_name = 'brands/detail.html' + + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + context['change_form'] = context.get('form') + brand_obj = self.get_object() + context['brand'] = model_to_dict(brand_obj) + return context def get_object(self, queryset=None): brand_id = self.kwargs.get('brand_id') diff --git a/admin/static/js/banners/banners.js b/admin/static/js/banners/banners.js index c39046000a7..e9d8b7d87e8 100644 --- a/admin/static/js/banners/banners.js +++ b/admin/static/js/banners/banners.js @@ -26,6 +26,9 @@ $(document).ready(function() { } }); - $(".colorpicker").colorpicker(); + $(".colorpicker").colorpicker({ + format: 'hex', + useAlpha: false + }); }); diff --git a/admin/static/js/brands/brands.js b/admin/static/js/brands/brands.js index 1115261d372..1acdca7f21b 100644 --- a/admin/static/js/brands/brands.js +++ b/admin/static/js/brands/brands.js @@ -5,6 +5,9 @@ require('bootstrap-colorpicker/dist/css/bootstrap-colorpicker.min.css'); $(document).ready(function() { - $(".colorpicker").colorpicker(); + $(".colorpicker").colorpicker({ + format: 'hex', + useAlpha: false + }); }); diff --git a/admin/webpack.prod.config.js b/admin/webpack.prod.config.js index abde25a29f3..76e6c5d74d4 100644 --- a/admin/webpack.prod.config.js +++ b/admin/webpack.prod.config.js @@ -18,7 +18,7 @@ module.exports = assign(admin, { '__DEV__': false }), new UglifyJsPlugin({ - exclude: /conference.*?\.js$/, + exclude: /(conference|metrics).*?\.js$/, sourceMap: true, uglifyOptions: {warnings: true}, }), From 10f0dd680df180b848b165fd856f493cd0ea31dd Mon Sep 17 00:00:00 2001 From: Vlad0n20 Date: Fri, 12 Sep 2025 18:02:53 +0300 Subject: [PATCH 2/2] Remove unnecessary exclusion --- admin/webpack.prod.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/webpack.prod.config.js b/admin/webpack.prod.config.js index 76e6c5d74d4..abde25a29f3 100644 --- a/admin/webpack.prod.config.js +++ b/admin/webpack.prod.config.js @@ -18,7 +18,7 @@ module.exports = assign(admin, { '__DEV__': false }), new UglifyJsPlugin({ - exclude: /(conference|metrics).*?\.js$/, + exclude: /conference.*?\.js$/, sourceMap: true, uglifyOptions: {warnings: true}, }),