Merge pull request #408 from Pitros/fix-likes

Fixed likes on stream view
Soundnode · Oct 12, 2015 · 9a0e819 · 9a0e819
2 parents 09520f0 + 94ccbf9
commit 9a0e819
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/public/js/common/SCapiService.js b/app/public/js/common/SCapiService.js
@@ -208,7 +208,7 @@ app.service('SCapiService', function ($http, $window, $q, $log, $state, $statePa
                                 return response.data.collection.concat(next_href_response.collection);
                         })
                     } else {
-                        return response.data;
+                        return response.data.collection;
                     }
                 } else {
                     // invalid response

diff --git a/app/public/js/stream/streamCtrl.js b/app/public/js/stream/streamCtrl.js
@@ -53,7 +53,7 @@ app.controller('StreamCtrl', function ($scope, SCapiService, $rootScope) {
             var track = tracksData[i].origin;
 
             if (track.hasOwnProperty('user_favorite'))
-                track.user_favorite = ($scope.likes.collection.indexOf(track.id) != -1);
+                track.user_favorite = ($scope.likes.indexOf(track.id) != -1);
         }
     }