Changeset 3797809

Timestamp:

05/02/12 15:34:04 (13 months ago)

Author:

yomguy <yomguy@…>

Branches:

security

Children:

b030e30

Parents:

0f7c20f (diff), c8cdfbe (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@…> (05/02/12 15:34:04)

git-committer:

yomguy <yomguy@…> (05/02/12 15:34:04)

Message:

Merge branch 'master' into security

Files:

• example/init/format/original_format.txt (added)
• telemeta/management/commands/telemeta-init-formats.py (added)
• telemeta/migrations/0010_auto__add_wheeldiameter__add_originalformat__del_field_format_tape_num.py (added)
• telemeta/migrations/0011_auto__del_field_format_item.py (added)
• telemeta/migrations/0012_auto__add_field_mediaitem_original_format.py (added)
• telemeta/migrations/0013_auto__chg_field_format_conservation_state.py (added)
• telemeta/models/__init__.py (modified) (1 diff)
• telemeta/models/enum.py (modified) (2 diffs)
• telemeta/models/format.py (added)
• telemeta/models/media.py (modified) (3 diffs)
• telemeta/views/base.py (modified) (3 diffs)
• telemeta/admin.py (modified) (1 diff)
• 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) (1 diff)

telemeta/models/__init__.py

@@ -43 +43 @@
 from dublincore import *
 from language import *
+from format import *
 

telemeta/models/enum.py

@@ -163 +163 @@
         ordering = ['ethnic_group__value']
 
+
 # Tape formats
+class WheelDiameter(Enumeration):
+    "Tape wheel diameter (cm)"
+
+    class Meta(MetaEnumeration):
+        db_table = 'tape_wheel_diameter'
+        verbose_name = _("tape wheel diameter (cm)")
+
 class TapeLength(Enumeration):
     "Tape length (cm)"
@@ -192 +200 @@
         verbose_name = _("tape vendor")
 
+class OriginalFormat(Enumeration):
+    "Item original format"
+
+    class Meta(MetaEnumeration):
+        db_table = 'original_format'
+        verbose_name = _("original format")
+

telemeta/models/media.py

@@ -50 +50 @@
 from telemeta.models.enum import *
 from telemeta.models.language import *
+from telemeta.models.format import *
 from django.db import models
 
@@ -347 +348 @@
     track                 = CharField(_('item number'))
     creator_reference     = CharField(_('reference'))
+    original_format       = ForeignKey(Format, related_name="item",
+                                       verbose_name=_('orinal format'), blank=True,
+                                        null=True, on_delete=models.SET_NULL)
     external_references   = TextField(_('published references'))
     copied_from_item      = WeakForeignKey('self', related_name="copies", verbose_name=_('copy of'))
@@ -676 +680 @@
         verbose_name_plural = _('fonds related media')
 
-
-class Format(ModelCore):
-    """ Physical format object as proposed by the LAM"""
-
-    item = ForeignKey(MediaItem, related_name="formats", verbose_name=_('item'))
-    original_code = CharField(_('original code'), required=True)
-    tape_number = CharField(_('tape number'))
-    status = CharField(_('status'))
-    conservation_state = CharField(_('conservation state'))
-    comments = TextField(_('comments'))
-
-    tape_length = WeakForeignKey(TapeLength, related_name="formats", verbose_name = _("tape length (cm)"))
-    tape_width  = WeakForeignKey(TapeWidth, related_name="formats", verbose_name = _("tape width (inch)"))
-    tape_speed = WeakForeignKey(TapeSpeed, related_name="formats", verbose_name = _("tape speed (m/s)"))
-    tape_vendor = WeakForeignKey(TapeVendor, related_name="formats")
-    tape_thickness = CharField(_('tape thickness (um)'))
-    tape_diameter = CharField(_('tape diameter (mm)'))
-    tape_reference = CharField(_('tape reference'))
-
-    class Meta(MetaCore):
-        db_table = 'media_formats'
-        verbose_name = _('format')
-
-    def __unicode__(self):
-        return self.original_code
-
-    @property
-    def public_id(self):
-        return self.original_code
-

telemeta/views/base.py

@@ -257 +257 @@
         year_min, year_max = MediaCollection.objects.all().publishing_year_range()
         pub_years = year_min and year_max and range(year_min, year_max + 1) or []
-        searches = Search.objects.filter(username=request.user)
+        if request.user.is_authenticated():
+            searches = Search.objects.filter(username=request.user)
+        else:
+            searches = []
         return render(request, 'telemeta/search_criteria.html', {
             'rec_years': rec_years,
@@ -427 +430 @@
     @method_decorator(login_required)
     def users(self, request):
-        users = User.objects.all()
+        users = User.objects.all().order_by('last_name')
         return render(request, 'telemeta/users.html', {'users': users})
 
@@ -654 +657 @@
             last_revision = None
 
-        physical_format = Format.objects.filter(item=item)
-        if physical_format:
-            physical_format = physical_format[0]
+        physical_format = item.format.physical_format
 
         return render(request, template,

telemeta/admin.py

@@ -6 +6 @@
 from telemeta.models.system import *
 from django.contrib import admin
+<<<<<<< HEAD
+from django.forms import CheckboxSelectMultiple
+=======
+>>>>>>> master
 from django.contrib.auth.models import User
 from django.contrib.auth.admin import UserAdmin

telemeta/models/system.py

@@ -42 +42 @@
 import django.db.models as models
 from django.forms import ModelForm
+from django.contrib.sessions.models import Session
 
 
@@ -90 +91 @@
     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

@@ -78 +78 @@
                                  {% endif %}
                                 {% endif %}
-                                {% endif %}
+                              {% endif %}
                             </td>
                         </tr>