Favorite genre not working - 1.0.11 #290

streamaserver · Feb 19, 2017 · 4b9fb24 · 4b9fb24
1 parent 55d5af2
commit 4b9fb24
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/grails-app/assets/javascripts/streama/controllers/profile-ctrl.js b/grails-app/assets/javascripts/streama/controllers/profile-ctrl.js
@@ -14,11 +14,8 @@ angular.module('streama').controller('profileCtrl', function ($scope, apiService
   });
 
   $scope.toggleSelectGenre = function (genre) {
-    if(_.find($scope.user.favoriteGenres, {apiId: genre.apiId})){
-      _.remove($scope.user.favoriteGenres, {apiId: genre.apiId});
-    }else{
-      $scope.user.favoriteGenres.push(genre);
-    }
+		$scope.user.favoriteGenres = _.xorBy($scope.user.favoriteGenres, [genre], 'apiId');
+		$scope.profileForm.$setDirty();
   };
 
   $scope.isGenreSelected = function (genre) {

diff --git a/grails-app/assets/javascripts/streama/templates/profile.tpl.htm b/grails-app/assets/javascripts/streama/templates/profile.tpl.htm
@@ -63,7 +63,7 @@ <h1>
         </div>
         <div class="col-sm-9">
           <ul class="genre-list">
-            <li class="genre-tag" ng-class="{'active': isGenreSelected(genre)}" ng-repeat="genre in availableGenres" ng-click="toggleSelectGenre(genre)">
+            <li class="genre-tag" ng-class="{'active': isGenreSelected(genre)}" ng-repeat="genre in availableGenres | orderBy:'name'" ng-click="toggleSelectGenre(genre)">
               {{genre.name}}
             </li>
           </ul>

diff --git a/grails-app/controllers/streama/UserController.groovy b/grails-app/controllers/streama/UserController.groovy
@@ -160,7 +160,8 @@ class UserController {
       return [user: user]
     }
 
-    respond status: UNAUTHORIZED
+    response.setStatus(UNAUTHORIZED.value())
+    render 'Not logged in'
   }
 
   @Transactional

diff --git a/grails-app/views/user/current.gson b/grails-app/views/user/current.gson
@@ -4,7 +4,7 @@ model {
 	User user
 }
 
-json g.render(user){
+json g.render(user, [deep: true]){
 	authorities user.authorities?.collect{[id: it?.id]}
 	isAdmin (user?.authorities?.find{it.authority == 'ROLE_ADMIN'} ? true : false)
 	isContentManager (user?.authorities?.find{it.authority == 'ROLE_CONTENT_MANAGER'} ? true : false)