Changeset 7ce214b


Ignore:
Timestamp:
Jul 18, 2012 3:40:49 PM (2 years ago)
Author:
yomguy <yomguy@…>
Branches:
master, crem, crem2, crem3, dev, dev2, diadems, dj1.6, feature/breadcrumbs, feature/ts-0.5, feature/ts-0.5.4, feature/writecache, generic, lam, lam2, mapsv3, merge, nlivemulti, sabiod, search, server, storage, telecaster
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@…> (18/07/2012 15:40:49)
git-committer:
yomguy <yomguy@…> (18/07/2012 15:40:49)
Message:

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

Location:
telemeta
Files:
1 added
4 edited

Legend:

Unmodified
Added
Removed
  • telemeta/models/media.py

    rb991c24 r7ce214b  
    368368 
    369369    # Media 
    370     file                  = FileField(_('file'), upload_to='items/%Y/%m/%d', db_column="filename") 
     370    file                  = FileField(_('file'), upload_to='items/%Y/%m/%d', db_column="filename", max_length=255) 
    371371 
    372372    # Technical data 
  • telemeta/templatetags/telemeta_utils.py

    rf59decb rb991c24  
    399399        return 'Audio' 
    400400 
     401@register.filter 
     402def installed(app): 
     403    if app in settings.INSTALLED_APPS: 
     404        return app 
     405    else: 
     406        return '' 
    401407 
    402408def do_ifloaded(parser, token): 
  • telemeta/views/base.py

    r4e5ae69 rb991c24  
    10131013            return response 
    10141014 
     1015        if 'webm' in extension: 
     1016            mime_type = 'video/webm' 
     1017            video = item.file.path 
     1018            response = HttpResponse(stream_from_file(video), mimetype = mime_type) 
     1019            response['Content-Disposition'] = 'attachment' 
     1020            return response 
     1021 
    10151022        for encoder in self.encoders: 
    10161023            if encoder.file_extension() == extension: 
  • telemeta/views/pages.py

    rfee90af rb991c24  
    1818        file.close() 
    1919 
    20     def __unicode__(self):         
     20    def __unicode__(self): 
    2121        file = open(self.filename, 'r') 
    2222        data = file.read() 
     
    6060        project_directory = os.getcwd() 
    6161 
    62     return project_directory         
     62    return project_directory 
    6363 
    6464def resolve_page_file(root, relative_path, ignore_slash_issue=False): 
     
    102102    return None 
    103103 
    104 def get_page_content(request, relative_path, ignore_slash_issue=False):      
     104def get_page_content(request, relative_path, ignore_slash_issue=False): 
    105105    lang = language_code(request) 
    106106    userroot = os.path.join(project_dir(), 'telemeta-pages') 
    107     rootlist = [os.path.join(userroot, lang), os.path.join(userroot, 'default'),  
     107    rootlist = [os.path.join(userroot, lang), os.path.join(userroot, 'default'), 
    108108                os.path.join(PAGES_ROOT, lang), os.path.join(PAGES_ROOT, 'default')] 
    109109    for root in rootlist: 
     
    112112            return content 
    113113 
    114     return None             
    115      
     114    return None 
     115 
    116116class MalformedPagePath(Exception): 
    117117    pass 
Note: See TracChangeset for help on using the changeset viewer.