Merge pull request #56 from MicroPyramid/media_fixes

changed the settings and fixed the checkbox issue in blog list
MicroPyramid · May 27, 2016 · 668e01d · 668e01d
2 parents d303bdf + 67221b2
commit 668e01d
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 8 deletions.
diff --git a/django_blog_it/django_blog_it/templates/dashboard/blog/blog_list.html b/django_blog_it/django_blog_it/templates/dashboard/blog/blog_list.html
@@ -160,8 +160,25 @@ <h2 align="center"> There are no blog-posts here !</h2>
 
         <script type="text/javascript">
         $("#selectAll").change(function() {
-            $(".bulk_button").toggle();
-            $(".bulk_actions:checkbox").attr('checked', this.checked);
+            // $(".bulk_button").toggle();
+            $(".bulk_actions:checkbox").prop('checked', $(this).prop("checked"));
+            if($(this).prop("checked")){
+                $(".bulk_button").show();
+            }else{
+                $(".bulk_button").hide();
+            }
+        });
+
+        $(".bulk_actions:checkbox").change(function() {
+            if ($(this).attr("id") != "selectAll"){
+                if($(".bulk_actions:checkbox:checked").length > 0){
+                    $(".bulk_button").show();
+                }
+                else{
+                    $("#selectAll").prop('checked', false);
+                    $(".bulk_button").hide();
+                }
+            }
         });
 
         $('#published').click(function(){

diff --git a/django_blog_it/settings.py b/django_blog_it/settings.py
@@ -3,11 +3,7 @@
 
 AWS_ENABLED = getattr(settings, 'AWS_ENABLED', False)
 BASE_DIR = getattr(settings, 'BASE_DIR')
-
-# settings.MEDIA_URL if settings.MEDIA_URL else '/media/'
-MEDIA_URL = settings.MEDIA_URL if settings.MEDIA_URL else '/media/'
-
-# settings.MEDIA_ROOT if settings.MEDIA_ROOT else os.path.join(BASE_DIR + '/media/')
-MEDIA_ROOT = settings.MEDIA_ROOT if settings.MEDIA_ROOT else os.path.join(BASE_DIR + '/media/')
+MEDIA_URL = settings.MEDIA_URL if settings.MEDIA_URL else '/media/'  # settings.MEDIA_URL if settings.MEDIA_URL else '/media/'
+MEDIA_ROOT = settings.MEDIA_ROOT if settings.MEDIA_ROOT else os.path.join(BASE_DIR + '/media/')  # settings.MEDIA_ROOT if settings.MEDIA_ROOT else os.path.join(BASE_DIR + '/media/')
 
 DISQUS_SHORTNAME = getattr(settings, 'DISQUS_SHORTNAME', '')