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 + }); });