From: yomguy <yomguy@parisson.com>
Date: Wed, 16 Mar 2011 15:27:23 +0000 (+0100)
Subject: change Playlist model
X-Git-Tag: 1.1~359
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=ed3b32f965520aad2d1f4a6efcdd7d5b84523430;p=telemeta.git

change Playlist model
---

diff --git a/telemeta/htdocs/css/telemeta.css b/telemeta/htdocs/css/telemeta.css
index dbe6a2c7..a0ac2e78 100644
--- 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 0ea12a2b..b5981921 100644
--- 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 771f7666..e24e0524 100644
--- 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 90b3089a..d4f684d3 100644
--- 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 = []