Merge pull request #19 from farridav/hotfix/image_uploads_cdn_assets

Hotfix/image uploads cdn assets

Author: wuyue92tree

adminlteui/admin.py

@@ -4,6 +4,7 @@
 from django.contrib import admin
 from django.contrib import messages
 from django.contrib.admin import widgets
+from django.core.files.storage import default_storage
 from django.urls import path, reverse
 from django.template.response import TemplateResponse
 from django.utils import timezone
@@ -29,9 +30,7 @@ def get_option(option_name):
 
 def handle_uploaded_file(f, file_name):
     # save site_logo
-    with open(settings.MEDIA_ROOT + '/' + file_name, 'wb+') as destination:
-        for chunk in f.chunks():
-            destination.write(chunk)
+    return default_storage.save(file_name, f)
 
 
 class ImageBox:
@@ -109,11 +108,8 @@ def save(self):
                         if not self.files.get(data_item) or self.data.get(
                                 data_item) == '':
                             continue
-                        handle_uploaded_file(self.files.get(data_item),
-                                             self.files.get(data_item).name)
-                        obj.option_value = settings.MEDIA_URL.lstrip(
-                            '/') + self.files.get(
-                            data_item).name
+                        filename = handle_uploaded_file(self.files.get(data_item), self.files.get(data_item).name)
+                        obj.option_value = settings.MEDIA_URL + filename
                     else:
                         if obj.option_value == self.data.get(data_item):
                             continue
@@ -124,13 +120,10 @@ def save(self):
                             self.errors[data_item] = _(
                                 'site_logo depends on setting.MEDIA_URL and setting.MEDIA_ROOT.')
                             return False
-                        handle_uploaded_file(self.files.get(data_item),
-                                             self.files.get(data_item).name)
+                        filename = handle_uploaded_file(self.files.get(data_item), self.files.get(data_item).name)
                         obj = Options.objects.create(
                             option_name=data_item,
-                            option_value=settings.MEDIA_URL.lstrip(
-                                '/') + self.files.get(
-                                data_item).name,
+                            option_value=settings.MEDIA_URL + filename,
                             create_time=timezone.now())
                     else:
                         obj = Options.objects.create(

adminlteui/templates/admin/base.html

@@ -12,10 +12,10 @@
     <!-- Tell the browser to be responsive to screen width -->
     <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
     <!-- Bootstrap 3.3.6 -->
-    <link rel="stylesheet" href={% static "admin/bootstrap/css/bootstrap.min.css" %}>
+    <link rel="stylesheet" href="//stackpath.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css">
     <!-- Font Awesome -->
     <!--<link rel="stylesheet" href="//cdn.bootcss.com/font-awesome/4.5.0/css/font-awesome.min.css">-->
-    <link rel="stylesheet" href={% static "admin/font-awesome/css/font-awesome.min.css" %}>
+    <link rel="stylesheet" href="//stackpath.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css">
     <!-- Ionicons -->
     <link rel="stylesheet" href={% static "admin/ionicons/ionicons.min.css" %}>
 
@@ -34,8 +34,8 @@
 
     <link rel="stylesheet" href={% static "admin/dist/css/django.css" %}>
     {% if adminlte_site_logo.valid %}
-    <link rel="apple-touch-icon" href="/{{ adminlte_site_logo.site_logo }}">
-    <link rel="icon" href="/{{ adminlte_site_logo.site_logo }}">
+    <link rel="apple-touch-icon" href="{{ adminlte_site_logo.site_logo }}">
+    <link rel="icon" href="{{ adminlte_site_logo.site_logo }}">
     {% else %}
     <link rel="apple-touch-icon" href="{% static "admin/dist/img/default-log.svg" %}">
     <link rel="icon" href="{% static "admin/dist/img/default-log.svg" %}">
@@ -58,15 +58,15 @@
             <!-- mini logo for sidebar mini 50x50 pixels -->
             <span class="logo-mini">
                 {% if adminlte_site_logo.valid %}
-                <img src="/{{ adminlte_site_logo.site_logo }}" class="user-image" alt="User Image" style="width:45px;height:45px;padding:5px;">
+                <img src="{{ adminlte_site_logo.site_logo }}" class="user-image" alt="User Image" style="width:45px;height:45px;padding:5px;">
                 {% else %}
                 <img src={% static "admin/dist/img/default-log.svg" %} class="user-image" alt="User Image" style="width:45px;height:45px;padding:5px;">
                 {% endif %}
             </span>
             <!-- logo for regular state and mobile devices -->
             <span class="logo-lg">
                 {% if adminlte_site_logo.valid %}
-                <img src="/{{ adminlte_site_logo.site_logo }}" class="user-image" alt="User Image" style="width:45px;height:45px;padding:5px;">
+                <img src="{{ adminlte_site_logo.site_logo }}" class="user-image" alt="User Image" style="width:45px;height:45px;padding:5px;">
                 {% else %}
                 <img src={% static "admin/dist/img/default-log.svg" %} class="user-image" alt="User Image" style="width:45px;height:45px;padding:5px;">
                 {% endif %}

adminlteui/templates/admin/login.html

@@ -17,7 +17,7 @@
     <!-- Tell the browser to be responsive to screen width -->
     <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
     <!-- Bootstrap 3.3.6 -->
-    <link rel="stylesheet" href={% static "admin/bootstrap/css/bootstrap.min.css" %}>
+    <link rel="stylesheet" href="//stackpath.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css">
     <!-- Font Awesome -->
     <link rel="stylesheet" href="//cdn.bootcss.com/font-awesome/4.5.0/css/font-awesome.min.css">
     <!-- Ionicons -->

adminlteui/templates/registration/logged_out.html

@@ -17,7 +17,7 @@
     <!-- Tell the browser to be responsive to screen width -->
     <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
     <!-- Bootstrap 3.3.6 -->
-    <link rel="stylesheet" href={% static "admin/bootstrap/css/bootstrap.min.css" %}>
+    <link rel="stylesheet" href="//stackpath.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css">
     <!-- Font Awesome -->
     <link rel="stylesheet" href="//cdn.bootcss.com/font-awesome/4.5.0/css/font-awesome.min.css">
     <!-- Ionicons -->