Changeset f2be6fd


Ignore:
Timestamp:
21/03/2012 15:09:11 (2 years ago)
Author:
yomguy <yomguy@…>
Branches:
security
Children:
cd59b6b
Parents:
ea9d476 (diff), 98fa6e9 (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@…> (21/03/2012 15:09:11)
git-committer:
yomguy <yomguy@…> (21/03/2012 15:09:11)
Message:

Merge branch 'master' into security

Location:
telemeta
Files:
2 added
1 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • telemeta/models/system.py

    rea9d476 rf2be6fd  
    8585    user            = ForeignKey(User, unique=True, required=True) 
    8686    institution     = CharField(_('Institution')) 
    87     department      = CharField(_('Department')) 
    8887    function        = CharField(_('Function')) 
    8988    attachment      = CharField(_('Attachment')) 
  • telemeta/admin.py

    rfabced9 rf6b65e4  
    66from telemeta.models.system import * 
    77from django.contrib import admin 
     8from django.forms import CheckboxSelectMultiple 
     9from django.contrib.auth.models import User 
     10from django.contrib.auth.admin import UserAdmin 
     11 
     12admin.site.unregister(User) 
    813 
    914class MediaFondsAdmin(admin.ModelAdmin): 
     
    7580    search_fields = ['code', 'vendor'] 
    7681 
     82class UserProfileInline(admin.StackedInline): 
     83        model = UserProfile 
     84 
     85class UserProfileAdmin(UserAdmin): 
     86        inlines = [UserProfileInline] 
     87 
    7788admin.site.register(MediaFonds, MediaFondsAdmin) 
    7889admin.site.register(MediaCorpus, MediaCorpusAdmin) 
     
    99110 
    100111admin.site.register(Format, FormatAdmin) 
     112 
     113admin.site.register(User, UserProfileAdmin) 
  • telemeta/templates/telemeta/inc/collection_related.html

    rea5ec32 r16d8a31  
    5656                            </td> 
    5757 
    58                             <td style="padding-bottom: 1em;">{% if media.is_image %} 
     58                            <td style="padding-bottom: 1em;"> 
     59                                {% if media.is_image %} 
    5960                                  {% if media.url %} 
    6061                                   <a href="{{ media.url }}"> 
     
    7071                                 {% endif %} 
    7172                                {% endif %} 
    72                                 {% endif %} 
     73                              {% endif %} 
    7374                            </td> 
    7475                        </tr> 
Note: See TracChangeset for help on using the changeset viewer.