Merge pull request #1092 from darkarp/master

Fixing error adding tv shows to watchlist

Author: dularion

grails-app/controllers/streama/WatchlistEntryController.groovy

@@ -101,7 +101,7 @@ class WatchlistEntryController {
       user == currentUser
       profile == currentProfile
       isDeleted == false
-      video != null
+      video != null || tvShow != null
     }.list(sort: sortingColumn, order: sortingOrder)
     if(!watchlistEntries){
       render status: NO_CONTENT

grails-app/services/streama/marshallers/MarshallerService.groovy

@@ -486,13 +486,7 @@ class MarshallerService {
         response['lastUpdated'] = watchlistEntry.lastUpdated
 
         response['tvShow'] = watchlistEntry.tvShow
-        response['video'] = [
-          id: watchlistEntry.video.id,
-          mediaType: watchlistEntry.video.getType(),
-          poster_path: watchlistEntry.video.getPosterPath(),
-          inWatchlist: watchlistEntry.video.inWatchlist(),
-          release_date: watchlistEntry.video.getReleaseDate()
-        ]
+        response['video'] = watchlistEntry.video
 
         return response
       }