From: mathieu <mathieu.boye28@gmail.com>
Date: Tue, 17 May 2016 07:52:54 +0000 (+0200)
Subject: Merge Parisson (Thomas' work)
X-Git-Tag: 1.6.2^2~15^2~3^2~6
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=8414cc407ab35b600885e1192b4ba1e848f12525;p=telemeta.git

Merge Parisson (Thomas' work)
---

8414cc407ab35b600885e1192b4ba1e848f12525
diff --cc app/scripts/app.sh
index 7053ff92,43dec020..047b557b
--- a/app/scripts/app.sh
+++ b/app/scripts/app.sh
@@@ -31,17 -31,19 +31,26 @@@ python $manage bower_install -- --allow
  python $manage collectstatic --noinput
  
  # telemeta setup
 +if [ $DATASTART = "True" ]
 +then
  python $manage telemeta-create-admin-user
  python $manage telemeta-create-boilerplate
 +fi
 +
 +if [ $REINDEX = "True" ]; then
 +    python $manage rebuild_index --noinput
 +fi
  
- if [ $DEBUG = "False" ]; then
+ # fix media access rights
+ chown www-data:www-data $media
+ for dir in $(ls $media); do
+     if [ ! $(stat -c %U $media/$dir) = 'www-data' ]; then
+         chown www-data:www-data $media/$dir
+     fi
+ done
+ 
+ # update haystack index in prod
+ if [ "$DEBUG" = "False" ]; then
      python $manage update_index --workers $processes &
  fi
  
diff --cc telemeta/static/telemeta/js/playlist.js
index 99ee41f1,9cd2562d..a4975a04
--- a/telemeta/static/telemeta/js/playlist.js
+++ b/telemeta/static/telemeta/js/playlist.js
@@@ -41,12 -41,15 +41,15 @@@ PopupDiv.listItemClass = "component_ico
  
  
  var playlistUtils = {
-     playlists: [],
+     playlists : [],
+     id: '', // ID var: used to edit playlist
+     title: '',
+     description: '',
  
 -    addPlaylist: function(name, id){
 +    addPlaylist: function (name, id) {
          this.playlists.push({
 -            'name':name,
 -            'id':id
 +            'name': name,
 +            'id': id
          });
      },
  
@@@ -126,50 -132,19 +133,19 @@@
          });
      },
  
-     showEdit: function (anchorElement, id) {
- 
-         var t = gettrans('title');
-         var d = gettrans('description');
-         var dd = {};
-         var playlist = this;
- 
-         var playlists = this.playlists;
-         for (var i = 0; i < playlists.length; i++) {
-             if (playlists[i].id == id) {
-                 dd[t] = playlists[i].title;
-                 dd[d] = playlists[i].description;
-             }
-         }
- 
-         new PopupDiv({
-             'content': dd,
-             invoker: anchorElement,
-             showOk: true,
-             onOk: function (data) {
-                 if (!data[t] && !data[d]) {
-                     return;
-                 }
-                 //convert language
-                 playlist.update({
-                     'public_id': id,
-                     'title': data[t],
-                     'description': data[d],
-                 });
-             }
-         }).show();
-     },
- 
      /*shows the popup for adding a resource to a playlist*/
 -    showAddResourceToPlaylist: function(anchorElement, resourceType, objectId, optionalOkMessage){
 +    showAddResourceToPlaylist: function (anchorElement, resourceType, objectId, optionalOkMessage) {
          var ar = [];
+         var pl = this;
          var playlists = this.playlists;
-         for (var i = 0; i < playlists.length; i++) {
+ 
+         for(var i=0; i< playlists.length; i++){
              ar.push(playlists[i].name);
          }
-         var pl = this;
  
-         if (!ar.length) {
-             pl.showAdd(anchorElement);
+ 
+         if(!ar.length){
+             this.showAdd(anchorElement);
          }
  
          //var addFcn = this.addResourceToPlaylist;
diff --cc telemeta/templates/telemeta/lists.html
index 7995f999,39167a09..fdb2b7df
--- a/telemeta/templates/telemeta/lists.html
+++ b/telemeta/templates/telemeta/lists.html
@@@ -69,10 -47,10 +54,10 @@@
  {% endblock %}
  
  {% comment "added by Killian Mary end" %}{% endcomment %}
 -
 +q
  <!--
   Added by Thomas Balastegui :
-  modal popup display and use of addNewPlaylist()
+  modal popup display and use of addNewPlaylist() and editPlaylist()
  -->
  {% block content %}
      {% block modal %}