Portuguese Translations, relative url and custom_admin_media_prefix tag changes

filebrowser/base.py

@@ -9,7 +9,8 @@
 
 # filebrowser imports
 from filebrowser.settings import *
-from filebrowser.functions import get_file_type, url_join, is_selectable, get_version_path
+from filebrowser.functions import get_file_type, url_join, is_selectable, \
+    get_version_path, path_strip
 from django.utils.encoding import force_unicode
 
 # PIL import
@@ -30,8 +31,8 @@ class FileObject(object):
     """
 
     def __init__(self, path):
-        self.path = path
-        self.url_rel = path.replace("\\","/")
+        self.path = path_strip(path, DIRECTORY)
+        self.url_rel = self.path.replace("\\","/")
         self.head = os.path.split(path)[0]
         self.filename = os.path.split(path)[1]
         self.filename_lower = self.filename.lower() # important for sorting
@@ -85,7 +86,7 @@ def _path_full(self):
         """
         return os.path.join(MEDIA_ROOT, self.path)
     path_full = property(_path_full)
-    
+
     def _path_relative(self):
         return self.path
     path_relative = property(_path_relative)
@@ -115,7 +116,11 @@ def _url_save(self):
         URL used for the filebrowsefield.
         """
         if SAVE_FULL_URL:
-            return self.url_full
+            if SAVE_DOMAIN_URL:
+                from django.contrib.sites.models import Site
+                return 'http://%s%s' % (Site.objects.get_current().domain, self.url_full)
+            else:
+                return self.url_full
         else:
             return self.url_rel
     url_save = property(_url_save)

filebrowser/functions.py

@@ -371,4 +371,12 @@ def convert_filename(value):
     else:
         return value
 
+def path_strip(path, root):
+    if not path or not root:
+        return path
+    path = os.path.normcase(path)
+    root = os.path.normcase(root)
+    if path.startswith(root):
+        return path[len(root):]
+    return path