fix MIME type in DC, fix delete button display, fix JS superuser parsing

diff --git a/telemeta/models/dublincore.py b/telemeta/models/dublincore.py
index 977400132aef90be1f78fe01e71827666ceb32c2..8ac675d1e4d781c6c39079661695171402a05d51 100644 (file)
--- a/telemeta/models/dublincore.py
+++ b/telemeta/models/dublincore.py
@@ -207,10 +207,10 @@ def express_item(item):
             title += u' - ' + item.track
     
     try:
-        analysis = MediaItemAnalysis(item=item, analyzer_id='mime_type')
+        analysis = MediaItemAnalysis.objects.get(item=item, analyzer_id='mime_type')
         mime_type = analysis.value 
     except:
-        mime_type = 'unknown'
+        mime_type = ''
 
     resource = Resource(
         Element('identifier',       media_identifier(item), related=item),

diff --git a/telemeta/templates/telemeta_default/base.html b/telemeta/templates/telemeta_default/base.html
index 48f1d9cdcc7877f00ee416b1ecca0278a9ede519..8ee6d23ccbfef5751f5e68895961890ce30a5464 100644 (file)
--- a/telemeta/templates/telemeta_default/base.html
+++ b/telemeta/templates/telemeta_default/base.html
@@ -102,7 +102,7 @@
     </tr></table>
 {% block content %}{% endblock %}
 <div class="nett"></div>
-{% block deleteitem %}{% endblock %}
+{% block delete %}{% endblock %}
 </div>
 
 {% block footer %}

diff --git a/telemeta/templates/telemeta_default/mediaitem_detail.html b/telemeta/templates/telemeta_default/mediaitem_detail.html
index 651cfa570ba554b3a01adf552c5e3e795a33cc63..3ea054e469cc49be74190b59e0cd9ca2a5ce4768 100644 (file)
--- a/telemeta/templates/telemeta_default/mediaitem_detail.html
+++ b/telemeta/templates/telemeta_default/mediaitem_detail.html
@@ -51,7 +51,7 @@
  // loadPlayer(analizerUrl, soundUrl, itemId, visualizers, currentUserName, isStaffOrSuperuser)
  // django before was: if user.is_staff or user.is_superuser 
 
-   {% if perms.can_play_all_items %}
+   {% if public_access or perms.telemeta.can_play_all_items %}
     var superuser = true;
    {% else %}
     var superuser = false;

diff --git a/telemeta/web/base.py b/telemeta/web/base.py
index 3f8b8f3cf5bfe4bc66bf1f4502035d0c4b632453..c4a4d7cd93cdee1dff7a842fa3dd4282dea1d4b8 100644 (file)
--- a/telemeta/web/base.py
+++ b/telemeta/web/base.py
@@ -1188,7 +1188,7 @@ class ProfileView(object):
             if user_form.is_valid() and profile_form.is_valid():
                 user_form.save()
                 profile_form.save()
-                return HttpResponseRedirect('/accounts/'+username+'/profile/')
+                return HttpResponseRedirect('/users/'+username+'/profile/')
         else:
             user_form = UserChangeForm(instance=user, prefix='user')
             profile_form = UserProfileForm(instance=profile, prefix='profile')