diff --git a/core/utils.py b/core/utils.py index 99b93844..b3f04ee6 100644 --- a/core/utils.py +++ b/core/utils.py @@ -9,6 +9,7 @@ import datetime from django.core.exceptions import ObjectDoesNotExist from django.conf import settings from django.utils.translation import get_language +import os current_lang = get_language()[:2] if current_lang == 'ru': @@ -105,7 +106,7 @@ def queryset_to_workbook(queryset, columns, report_date = None): month = month_name,year = report_date.strftime("%Y")), main_style) for i in range(7): sheet.row(i).set_style(xlwt.Style.easyxf('font:height 300;')) - sheet.insert_bitmap('/home/www/proj/static/logo.bmp', row=0, col=5, x=0, y=0, scale_x=0.3, scale_y=2) + sheet.insert_bitmap(os.path.join(settings.MEDIA_ROOT, 'logo.bmp'), row=0, col=5, x=0, y=0, scale_x=0.3, scale_y=2) # drawing headers for i, column in enumerate(columns): diff --git a/core/views.py b/core/views.py index 125c1f1f..8da905d5 100644 --- a/core/views.py +++ b/core/views.py @@ -297,7 +297,7 @@ def download_workbook(request): workbook = queryset_to_workbook(qs, columns, earliest_event) response = HttpResponse(content_type='application/vnd.ms-excel') - response['Content-Disposition'] = 'attachment; filename="My calendar.xls"' + response['Content-Disposition'] = 'attachment; filename="My calendar for %s.xls"' % earliest_event.strftime("%B %Y") workbook.save(response) return response else: