Changeset 01772af

Timestamp:

05/02/12 16:31:24 (13 months ago)

Author:

yomguy <yomguy@…>

Branches:

security

Children:

7566b3e

Parents:

b030e30 (diff), 03ca023 (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 16:31:24)

git-committer:

yomguy <yomguy@…> (05/02/12 16:31:24)

Message:

Merge branch 'master' into security

Files:

• README.rst (modified) (1 diff)
• telemeta/models/media.py (modified) (2 diffs)
• telemeta/models/query.py (modified) (5 diffs)
• telemeta/templates/telemeta/search_criteria.html (modified) (1 diff)
• telemeta/templates/telemeta/search_results.html (modified) (1 diff)
• 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)

README.rst

@@ -191 +191 @@
   * MMSH : Maison Méditerranéenne des Sciences de l'Homme
     http://www.mmsh.univ-aix.fr/
+

telemeta/models/media.py

@@ -349 +349 @@
     creator_reference     = CharField(_('reference'))
     original_format       = ForeignKey(Format, related_name="item",
-                                       verbose_name=_('orinal format'), blank=True,
+                                       verbose_name=_('original format'), blank=True,
                                         null=True, on_delete=models.SET_NULL)
     external_references   = TextField(_('published references'))
@@ -412 +412 @@
             title += ' ' + self.track
         return title
+
+    @property
+    def instruments(self):
+        "Return the instruments of the item"
+        instruments = []
+        performances = MediaItemPerformance.objects.filter(media_item=self)
+        for performance in performances:
+            instrument = performance.instrument
+            alias = performance.alias
+            if not instrument in instruments:
+                instruments.append(instrument)
+            if not alias in instruments:
+                instruments.append(alias)
+
+        instruments.sort(self.__name_cmp)
+        return instruments
+
+        instruments.verbose_name = _("instruments")
 
 

telemeta/models/query.py

@@ -201 +201 @@
         return self.filter(file__contains='/')
 
+    def by_instrument(self, instrument):
+        "Find items by instrument"
+        return self.filter(instruments__in=instrument)
+
 
 class MediaItemManager(CoreManager):
@@ -244 +248 @@
         return self.get_query_set().sound(*args, **kwargs)
     sound.__doc__ = MediaItemQuerySet.sound.__doc__
+
+    def by_instrument(self, *args, **kwargs):
+        return self.get_query_set().by_instrument(*args, **kwargs)
+    by_instrument.__doc__ = MediaItemQuerySet.by_instrument.__doc__
 
 
@@ -332 +340 @@
         return self.filter(items__file__contains='/').distinct()
 
+    def by_instrument(self, instrument):
+        "Find collections by instrument"
+        return self.filter(items__instruments__in=instrument).distinct()
+
 
 class MediaCollectionManager(CoreManager):
@@ -375 +387 @@
         return self.get_query_set().sound(*args, **kwargs)
     sound.__doc__ = MediaCollectionQuerySet.sound.__doc__
+
+    def by_instrument(self, *args, **kwargs):
+        return self.get_query_set().by_instrument(*args, **kwargs)
+    by_instrument.__doc__ = MediaCollectionQuerySet.by_instrument.__doc__
 
 
@@ -478 +494 @@
         return self.get_query_set().quick_search(*args, **kwargs)
     quick_search.__doc__ = MediaFondsQuerySet.quick_search.__doc__
+
+
+class InstrumentQuerySet(CoreQuerySet):
+    "Base class for all media instrument query sets"
+
+    def quick_search(self, pattern):
+        "Perform a quick search on text and char fields"
+        from telemeta.models.instrument import Instrument
+        mod = Instrument()
+        pattern = pattern.strip()
+        q = Q(code__contains=pattern)
+        fields = mod.to_dict()
+        keys =  fields.keys()
+        for field in keys:
+            field_str = str(mod._meta.get_field(field))
+            if 'CharField' in field_str or 'TextField' in field_str:
+                q = q | word_search_q(field, pattern)
+        return self.filter(q)
+
+
+class InstrumentManager(CoreManager):
+    "Manage instrument queries"
+
+    def get_query_set(self):
+        "Return instrument query sets"
+        return InstrumentQuerySet(self.model)
+
+    def quick_search(self, *args, **kwargs):
+        return self.get_query_set().quick_search(*args, **kwargs)
+    quick_search.__doc__ = InstrumentQuerySet.quick_search.__doc__

telemeta/templates/telemeta/search_criteria.html

@@ -63 +63 @@
     <label for="location">{% field_label "Location" %}</label>
     <input type="text" name="location" id="location" value="{{ criteria.location }}" />
+    </p>
+
+    <p>
+    <label for="instrument">{% field_label "Instrument" %}</label>
+    <input type="text" name="instrument" id="instrument" />
     </p>
 

telemeta/templates/telemeta/search_results.html

@@ -28 +28 @@
   {% if criteria.location %}
     <li><b>{% field_label "Location" %}:</b> {{criteria.location}}</li>
+  {% endif %}
+  {% if criteria.instrument %}
+  <li><b>{% field_label "Instrument" %}:</b> {{criteria.instrument}}</li>
   {% endif %}
   {% if criteria.ethnic_group %}

telemeta/views/base.py

@@ -344 +344 @@
                 collections.sound(),
                 items.sound()),
+            'instrument': lambda value: (
+                collections.by_instrument(value),
+                items.by_instrument(value)),
         }
 
@@ -657 +660 @@
             last_revision = None
 
-        physical_format = item.format.physical_format
+        physical_format = item.original_format.original_format
 
         return render(request, template,
@@ -1477 +1480 @@
     subjects = settings.TELEMETA_SUBJECTS
     tags = ['title', 'description', 'comment']
-    title = organization + ' - Telemeta - ' + ugettext('Last changes')
+    title = organization.decode('utf8') + ' - Telemeta - ' + ugettext('Last changes')
     link = ""
     description = ' '.join([subject.decode('utf-8') for subject in subjects])

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>