From 1e0cbc1fcd2ca1cfc1da3610e62499a52e768747 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Sun, 16 Oct 2011 07:28:51 -0400 Subject: [PATCH] Correctly calculate the mimetype icons paths when on development mode --- apps/mimetype/api.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/apps/mimetype/api.py b/apps/mimetype/api.py index b4d0d86749..3ef46c711d 100644 --- a/apps/mimetype/api.py +++ b/apps/mimetype/api.py @@ -71,12 +71,18 @@ mimetype_icons = { def get_icon_file_path(mimetype): file_name = mimetype_icons.get(mimetype, UNKNWON_TYPE_FILE_NAME) - return os.path.join(settings.STATIC_ROOT, MIMETYPE_ICONS_DIRECTORY_NAME, file_name) - + if settings.DEVELOPMENT: + return os.path.join(settings.PROJECT_ROOT, 'apps', 'mimetype', 'static', MIMETYPE_ICONS_DIRECTORY_NAME, file_name) + else: + return os.path.join(settings.STATIC_ROOT, MIMETYPE_ICONS_DIRECTORY_NAME, file_name) + def get_error_icon_file_path(): - return os.path.join(settings.STATIC_ROOT, MIMETYPE_ICONS_DIRECTORY_NAME, ERROR_FILE_NAME) - + if settings.DEVELOPMENT: + return os.path.join(settings.PROJECT_ROOT, 'apps', 'mimetype', 'static', MIMETYPE_ICONS_DIRECTORY_NAME, ERROR_FILE_NAME) + else: + return os.path.join(settings.STATIC_ROOT, MIMETYPE_ICONS_DIRECTORY_NAME, ERROR_FILE_NAME) + def get_mimetype(filepath): """