change Playlist model

diff --git a/telemeta/htdocs/css/telemeta.css b/telemeta/htdocs/css/telemeta.css
index dbe6a2c7190297fc8bbf81d2b70386dd2ef84f54..a0ac2e78ef2b34a1f8592b18fa2c0f4bbef3e6ef 100644 (file)
--- a/telemeta/htdocs/css/telemeta.css
+++ b/telemeta/htdocs/css/telemeta.css
@@ -171,7 +171,6 @@ a img { border: none; }
     background-color: #fdfdfd;
     color: #000;
     padding: 4px;
-    
 }
 
 /* Geographic navigator */

diff --git a/telemeta/models/media.py b/telemeta/models/media.py
index 0ea12a2b2f4af313607b90f9507d7fa70e77bca3..b5981921d230027d10193d9e9a744df8cb4ca32c 100644 (file)
--- a/telemeta/models/media.py
+++ b/telemeta/models/media.py
@@ -349,7 +349,7 @@ class Playlist(ModelCore):
     element_type = 'playlist'
     public_id      = CharField(_('public_id'), required=True)
     author         = ForeignKey(User, related_name="playlists", db_column="author")
-    name           = CharField(_('name'), required=True)
+    title          = CharField(_('title'), required=True)
     description    = TextField(_('description'))
     is_current     = BooleanField(_('current_user_playlist'))
 

diff --git a/telemeta/templates/telemeta_default/home.html b/telemeta/templates/telemeta_default/home.html
index 771f7666b3f00e36d3b3e5ffa95799a7cb5e7968..e24e0524f895965b4f091d0edd7c7a077a986c19 100644 (file)
--- a/telemeta/templates/telemeta_default/home.html
+++ b/telemeta/templates/telemeta_default/home.html
@@ -50,7 +50,7 @@
 <h3>{% trans "Playlists" %} {% trans "Add" %}</h3>
   {% for playlist in playlists %}
   <div>
-  <h2>{{ playlist.playlist.name }} {% if playlist.playlist.is_current %}(current){% endif %} 
+  <h2>{{ playlist.playlist.title }} {% if playlist.playlist.is_current %}(current){% endif %} 
   <a href="{% url telemeta-playlist-csv-export playlist.playlist.public_id %}">CSV</a>
   {% if not playlist.playlist.is_current %}
     {% trans "Make_Current" %} 

diff --git a/telemeta/web/base.py b/telemeta/web/base.py
index 90b3089a9d2b7981983ce202ca4707f1dc764bc9..d4f684d3bf2a73693cc5b507d20825c84f8559be 100644 (file)
--- a/telemeta/web/base.py
+++ b/telemeta/web/base.py
@@ -782,7 +782,7 @@ class WebView(object):
         if isinstance(playlist, dict):
             m = Playlist()
             m.public_id = playlist['public_id']
-            m.name = playlist['name']
+            m.title = playlist['title']
             m.description = playlist['description']
             m.author = request.user
             m.is_current = False
@@ -827,7 +827,7 @@ class WebView(object):
     def update_playlist(request, playlist):
         if isinstance(playlist, dict):
             m = Playlist.objects.get(public_id=playlist['public_id'])
-            m.name = float(playlist['name'])
+            m.title = float(playlist['title'])
             m.description = playlist['description']
             m.save()
         else:
@@ -855,7 +855,7 @@ class WebView(object):
         playlist = Playlist.objects.get(public_id=public_id, author=request.user)
         resources = PlaylistResource.objects.filter(playlist=playlist)
         response = HttpResponse(mimetype='text/csv')
-        response['Content-Disposition'] = 'attachment; filename='+playlist.name+'.csv'
+        response['Content-Disposition'] = 'attachment; filename='+playlist.title+'.csv'
         writer = UnicodeWriter(response)
         
         items = []