Changeset bf87cda

Timestamp:

03/21/12 14:44:33 (14 months ago)

Author:

yomguy <yomguy@…>

Branches:

master, crem, crem2, dev, diadems, generic, instru_search, lam, nlivemulti, release/1.4.4, security, social, storage, test

Children:

30741ae

Parents:

86f7310 (diff), fabced9 (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 14:44:33)

git-committer:

yomguy <yomguy@…> (03/21/12 14:44:33)

Message:

Merge branch 'master' into dev

Files:

• setup.py (modified) (1 diff)
• telemeta/admin.py (modified) (1 diff)
• telemeta/htdocs/js/playlist.js (modified) (7 diffs)
• telemeta/models/media.py (modified) (1 diff)
• telemeta/templates/postman/archives.html (added)
• telemeta/templates/postman/base.html (added)
• telemeta/templates/postman/base_folder.html (added)
• telemeta/templates/postman/base_write.html (added)
• telemeta/templates/postman/email_user.txt (added)
• telemeta/templates/postman/email_user_subject.txt (added)
• telemeta/templates/postman/email_visitor.txt (added)
• telemeta/templates/postman/email_visitor_subject.txt (added)
• telemeta/templates/postman/inbox.html (added)
• telemeta/templates/postman/inc_subject_ex.html (added)
• telemeta/templates/postman/reply.html (added)
• telemeta/templates/postman/sent.html (added)
• telemeta/templates/postman/trash.html (added)
• telemeta/templates/postman/view.html (added)
• telemeta/templates/postman/write.html (added)
• telemeta/templates/telemeta/base.html (modified) (5 diffs)
• telemeta/templatetags/telemeta_utils.py (modified) (1 diff)
• 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) (1 diff)

setup.py

@@ -20 +20 @@
         'timeside',
         'south',
+        'django-pagination',
+        'django-postman',
+        'django-socialregistration',
   ],
   platforms=['OS Independent'],

telemeta/admin.py

@@ -6 +6 @@
 from telemeta.models.system import *
 from django.contrib import admin
-from django.forms import CheckboxSelectMultiple
 
 class MediaFondsAdmin(admin.ModelAdmin):
     search_fields = ['title', 'code']
     ordering = ['code']
+    filter_horizontal = ['children']
 
 class MediaCorpusAdmin(admin.ModelAdmin):
     search_fields = ['title', 'code']
     ordering = ['code']
-    formfield_overrides = {
-        models.ManyToManyField: {'widget': CheckboxSelectMultiple}
-        }
-
+    filter_horizontal = ['children']
+    
 class MediaCollectionAdmin(admin.ModelAdmin):
     search_fields = ['title', 'code']

telemeta/htdocs/js/playlist.js

@@ -93 +93 @@
         return new String(d.getTime() + '' + Math.floor(Math.random() * 1000000)).substr(0, 18);
     },
+
     add : function(dictionary){
 
         if(dictionary.public_id===undefined){
-            dictionary.public_id = this.uniqid(); //defined in application.js
+            dictionary.public_id = this.uniqid();
         }
         if(dictionary.user===undefined){
@@ -106 +107 @@
         });
     },
-    
+
     remove: function(id){
         json([id],'telemeta.del_playlist',function(){
@@ -131 +132 @@
         var dd = {};
         var playlist = this;
-        
+
         var playlists = this.playlists;
         for (var i=0; i< playlists.length; i++){
@@ -139 +140 @@
             }
         }
-        
+
         new PopupDiv({
             'content':dd,
@@ -157 +158 @@
         }).show();
     },
-    
+
     /*shows the popup for adding a resource to a playlist*/
     showAddResourceToPlaylist: function(anchorElement, resourceType, objectId, optionalOkMessage){
@@ -166 +167 @@
         }
         var pl = this;
-        
+
         if(!ar.length){
             pl.showAdd(anchorElement);
         }
-        
+
         //var addFcn = this.addResourceToPlaylist;
         new PopupDiv({
@@ -178 +179 @@
                 var val = data.selIndex;
                 var callbackok = undefined;
-                    
+
                 if(optionalOkMessage){
                     callbackok = function(){

telemeta/models/media.py

@@ -88 +88 @@
 
 class MediaBaseResource(MediaResource):
-    "Describe a base resource"
+    "Describe a media base resource"
 
     title                 = CharField(_('title'), required=True)

telemeta/templates/telemeta/base.html

@@ -20 +20 @@
 <![endif]-->
 {% endblock %}
+
+{% block extra_stylesheets %}{% endblock %}
 
 {% block javascript %}
@@ -92 +94 @@
   <li><a href="{% url telemeta-home %}" class="blue">{% trans "Home" %}</a></li>
  {% endif %}
+
+ {% block archives %}
  <li><a href="#archives#" class="green">{% trans "Archives" %}</a>
   <ul>
@@ -101 +105 @@
   <div class="clear"></div>
  </li>
+ {% endblock archives %}
+ 
+ {% block geonav %}
  <li><a href="{% url telemeta-geo-continents %}" class="yellow">{% trans "Geo Navigator" %}</a></li>
+ {% endblock geonav %}
+
  <li><a href="{% url telemeta-search-criteria %}" class="orange">{% trans "Advanced search" %}</a></li>
  {% if user.is_authenticated %}
@@ -124 +133 @@
 {% endblock header %}
 
+{% block postman_menu %}
+{% endblock postman_menu %}
+
 <div id="content">
     <table id="content_header"><tr>
@@ -133 +145 @@
 {% block delete %}{% endblock %}
 </div>
+
+{% block body %}
+{% endblock body %}
 
 {% block footer %}

telemeta/templatetags/telemeta_utils.py

@@ -398 +398 @@
         return 'Audio'
 
+@register.filter
+def installed(app):
+    return app in settings.INSTALLED_APPS

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

@@ -339 +339 @@
                 collections.sound(),
                 items.sound()),
+            'instrument': lambda value: (
+                collections.by_instrument(value),
+                items.by_instrument(value)),
         }