Changeset 7ce214b

Timestamp:

07/18/12 15:40:49 (10 months ago)

Author:

yomguy <yomguy@…>

Branches:

master, crem, crem2, dev, diadems, generic, lam, nlivemulti, storage

Children:

73ec04e

Parents:

b991c24 (diff), e6bdfd6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

yomguy <yomguy@…> (07/18/12 15:40:49)

git-committer:

yomguy <yomguy@…> (07/18/12 15:40:49)

Message:

Merge branch 'dev' of git+ssh://vcs.parisson.com/var/git/telemeta into dev

Location:

telemeta

Files:

• models/media.py (modified) (1 diff)
• migrations/0021_auto__chg_field_mediaitemrelated_file__chg_field_mediafondsrelated_fil.py (added)
• templatetags/telemeta_utils.py (modified) (1 diff)
• views/base.py (modified) (1 diff)
• views/pages.py (modified) (4 diffs)

telemeta/models/media.py

@@ -368 +368 @@
 
     # Media
-    file                  = FileField(_('file'), upload_to='items/%Y/%m/%d', db_column="filename")
+    file                  = FileField(_('file'), upload_to='items/%Y/%m/%d', db_column="filename", max_length=255)
 
     # Technical data

telemeta/templatetags/telemeta_utils.py

@@ -399 +399 @@
         return 'Audio'
 
+@register.filter
+def installed(app):
+    if app in settings.INSTALLED_APPS:
+        return app
+    else:
+        return ''
 
 def do_ifloaded(parser, token):

telemeta/views/base.py

@@ -1013 +1013 @@
             return response
 
+        if 'webm' in extension:
+            mime_type = 'video/webm'
+            video = item.file.path
+            response = HttpResponse(stream_from_file(video), mimetype = mime_type)
+            response['Content-Disposition'] = 'attachment'
+            return response
+
         for encoder in self.encoders:
             if encoder.file_extension() == extension:

telemeta/views/pages.py

@@ -18 +18 @@
         file.close()
 
-    def __unicode__(self):        
+    def __unicode__(self):
         file = open(self.filename, 'r')
         data = file.read()
@@ -60 +60 @@
         project_directory = os.getcwd()
 
-    return project_directory        
+    return project_directory
 
 def resolve_page_file(root, relative_path, ignore_slash_issue=False):
@@ -102 +102 @@
     return None
 
-def get_page_content(request, relative_path, ignore_slash_issue=False):     
+def get_page_content(request, relative_path, ignore_slash_issue=False):
     lang = language_code(request)
     userroot = os.path.join(project_dir(), 'telemeta-pages')
-    rootlist = [os.path.join(userroot, lang), os.path.join(userroot, 'default'), 
+    rootlist = [os.path.join(userroot, lang), os.path.join(userroot, 'default'),
                 os.path.join(PAGES_ROOT, lang), os.path.join(PAGES_ROOT, 'default')]
     for root in rootlist:
@@ -112 +112 @@
             return content
 
-    return None            
-    
+    return None
+
 class MalformedPagePath(Exception):
     pass