Changeset d1df64b

Timestamp:

03/21/12 17:09:58 (14 months ago)

Author:

yomguy <yomguy@…>

Branches:

security

Children:

40fcc15

Parents:

f6151cd (diff), aa83e80 (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@…> (03/21/12 17:09:58)

git-committer:

yomguy <yomguy@…> (03/21/12 17:09:58)

Message:

Merge branch 'master' into security

Files:

• example/sandbox_sqlite/settings.py (modified) (2 diffs)
• setup.py (modified) (1 diff)
• telemeta/__init__.py (modified) (1 diff)
• telemeta/templates/telemeta/inc/resource_related.html (modified) (2 diffs)
• telemeta/templates/telemeta/profile_detail.html (modified) (1 diff)
• telemeta/urls.py (modified) (2 diffs)
• telemeta/admin.py (modified) (3 diffs)
• telemeta/middleware.py (added)
• telemeta/migrations/0009_auto__add_field_userprofile_last_session_key.py (added)
• telemeta/models/system.py (modified) (2 diffs)
• telemeta/templates/telemeta/inc/collection_related.html (modified) (2 diffs)

example/sandbox_sqlite/settings.py

@@ -106 +106 @@
     'jsonrpc',
     'south',
+    'sorl.thumbnail',
 )
 
@@ -118 +119 @@
 TELEMETA_GMAP_KEY = 'ABQIAAAArg7eSfnfTkBRma8glnGrlxRVbMrhnNNvToCbZQtWdaMbZTA_3RRGObu5PDoiBImgalVnnLU2yN4RMA'
 TELEMETA_CACHE_DIR = MEDIA_ROOT + 'cache'
-TELEMETA_EXPORT_CACHE_DIR = TELEMETA_CACHE_DIR + "/export"
+TELEMETA_EXPORT_CACHE_DIR = MEDIA_ROOT + 'export'
 TELEMETA_DATA_CACHE_DIR = TELEMETA_CACHE_DIR + "/data"
 

setup.py

@@ -23 +23 @@
         'django-postman',
         'django-socialregistration',
+        'sorl-thumbnail',
   ],
   platforms=['OS Independent'],

telemeta/__init__.py

@@ -13 +13 @@
 
 __docformat__ = 'epytext en'
-__version__ = '1.4.2'
+__version__ = '1.4.3'
 __url__ = 'http://telemeta.org'
 __copyright__ = '(C) 2007-2012 Parisson'

telemeta/templates/telemeta/inc/resource_related.html

@@ -1 +1 @@
 {% load i18n %}
 {% load telemeta_utils %}
+{% load thumbnail %}
 
         <div>
@@ -58 +59 @@
                             <td style="padding-bottom: 1em;">
                                 {% if media.is_image %}
-                                  {% if media.url %}
-                                   <a href="{{ media.url }}">
-                                   <img src="{{ media.url }}" style="max-width: 420px; max-height: 200px;" /></a>
+                                  {% if media.file %}
+                                  <a href="{% url telemeta-resource-related type resource.code media.id %}">
+                                   {% thumbnail media.file "420" as im %}
+                                    <img src="{{ im.url }}" style="max-width: 420px; max-height: 200px;" />
+                                   {% endthumbnail %}
+                                   </a>
                                   {% else %}
-                                   <a href="{% url telemeta-resource-related type resource.code media.id %}">
-                                   <img src="{% url telemeta-resource-related type resource.code media.id %}" style="max-width: 420px; max-height: 200px;" /></a>
-                                   {% endif %}
+                                  <a href="{{ media.url }}">
+                                  {% thumbnail media.url "420" as im %}
+                                   <img src="{{ im.url }}" style="max-width: 420px; max-height: 200px;" />
+                                  {% endthumbnail %}
+                                  </a>
+                                 {% endif %}
                                 {% else %}
                                 {% if media.url %}

telemeta/templates/telemeta/profile_detail.html

@@ -42 +42 @@
       
       <dt>{% trans "Institution" %}</dt><dd>{% if profile %}{{ profile.institution }}{% endif %}</dd>
+      <dt>{% trans "Department" %}</dt><dd>{% if profile %}{{ profile.department }}{% endif %}</dd>
       <dt>{% trans "Function" %}</dt><dd>{% if profile %}{{ profile.function }}{% endif %}</dd>
       <dt>{% trans "Attachment" %}</dt><dd>{% if profile %}{{ profile.attachment }}{% endif %}</dd>

telemeta/urls.py

@@ -36 +36 @@
 
 from django.conf.urls.defaults import *
+from django.conf import settings
 from django.views.generic.simple import redirect_to
 from telemeta.models import MediaItem, MediaCollection, MediaItemMarker, MediaCorpus, MediaFonds
@@ -330 +331 @@
     url(r'^rss/$', LastestRevisionsFeed(), name="telemeta-rss"),
 
+    # Static media
+    # FIXME:need to move export dir from the cache
+    url(r'^media/cache/(?P<path>.*)$', 'django.views.static.serve', {
+            'document_root': settings.TELEMETA_CACHE_DIR,}),
 )
 

telemeta/admin.py

@@ -6 +6 @@
 from telemeta.models.system import *
 from django.contrib import admin
+from django.forms import CheckboxSelectMultiple
+from django.contrib.auth.models import User
+from django.contrib.auth.admin import UserAdmin
+
+admin.site.unregister(User)
 
 class MediaFondsAdmin(admin.ModelAdmin):
@@ -75 +80 @@
     search_fields = ['code', 'vendor']
 
+class UserProfileInline(admin.StackedInline):
+        model = UserProfile
+
+class UserProfileAdmin(UserAdmin):
+        inlines = [UserProfileInline]
+
 admin.site.register(MediaFonds, MediaFondsAdmin)
 admin.site.register(MediaCorpus, MediaCorpusAdmin)
@@ -99 +110 @@
 
 admin.site.register(Format, FormatAdmin)
+
+admin.site.register(User, UserProfileAdmin)

telemeta/models/system.py

@@ -42 +42 @@
 import django.db.models as models
 from django.forms import ModelForm
+from django.contrib.sessions.models import Session
 
 
@@ -88 +89 @@
     telephone       = CharField(_('Telephone'))
     expiration_date = DateField(_('Expiration_date'))
+    last_session_key = CharField(blank=True, null=True, max_length=40)
 
     class Meta(MetaCore):

telemeta/templates/telemeta/inc/collection_related.html

@@ -56 +56 @@
                             </td>
 
-                            <td style="padding-bottom: 1em;">{% if media.is_image %}
+                            <td style="padding-bottom: 1em;">
+                                {% if media.is_image %}
                                   {% if media.url %}
                                    <a href="{{ media.url }}">
@@ -70 +71 @@
                                  {% endif %}
                                 {% endif %}
-                                {% endif %}
+                              {% endif %}
                             </td>
                         </tr>