Changeset 1d503bb


Ignore:
Timestamp:
Jun 1, 2012 1:25:30 AM (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, release/1.4.4, sabiod, search, server, storage, telecaster
Children:
38d04ee, ce34009
Parents:
e6922a5
git-author:
yomguy <yomguy@…> (01/06/2012 01:25:30)
git-committer:
yomguy <yomguy@…> (01/06/2012 01:25:30)
Message:

fix bug for item marker url, add <hr> to item edit

Location:
telemeta
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • telemeta/models/media.py

    r64bc9e8 r1d503bb  
    365365    copied_from_item      = WeakForeignKey('self', related_name="copies", verbose_name=_('copy of')) 
    366366 
     367    # Technical data 
     368    approx_duration       = DurationField(_('approximative duration')) 
     369 
    367370    # Media 
    368371    file                  = FileField(_('file'), upload_to='items/%Y/%m/%d', db_column="filename") 
    369  
    370     # Technical data 
    371     approx_duration       = DurationField(_('approximative duration')) 
    372372 
    373373    # Manager 
  • telemeta/templates/telemeta/mediaitem_edit.html

    rbc866e5 r1d503bb  
    1717    {% for form in forms %} 
    1818    <tr><td colspan="2">{% for error in form.non_field_errors %}<li class="error">{{ error }}</li>{% endfor %}</td></tr> 
     19    <tr><td colspan="2"><h2>{{ form.prefix|capitalize }}</h2><hr /></td></tr> 
     20 
    1921    {% for field in form %} 
    2022    <tr> 
     
    3638    {% endfor %} 
    3739    </table> 
     40    <hr /> 
    3841    <div align="center" style="margin-top:3ex;"> 
    3942    <a href="{% url telemeta-item-detail item.public_id %}" class="component_icon button icon_cancel">{% trans "Cancel" %}</a> 
  • telemeta/urls.py

    rc676291 r1d503bb  
    123123    url(r'^archives/items/(?P<public_id>[A-Za-z0-9._-]+)/related_edit/$', item_view.related_media_edit,  dict(template='telemeta/mediaitem_related_edit.html'), name="telemeta-item-related_edit"), 
    124124    # Markers 
    125     url(r'^markers/(?P<marker_id>[A-Za-z0-9]+)/$', item_view.item_detail, name="telemeta-item-detail-marker"), 
     125    url(r'^archives/markers/(?P<marker_id>[A-Za-z0-9]+)/$', item_view.item_detail, name="telemeta-item-detail-marker"), 
    126126    # FIXME: need all paths 
    127127    url(r'^items/(?P<path>[A-Za-z0-9._-s/]+)/$', redirect_to, {'url': '/archives/items/%(path)s/', 'permanent': False}, name="telemeta-item-redir"), 
Note: See TracChangeset for help on using the changeset viewer.