Merge pull request #60 from pepf/master

[BugFix] Allow editing of profile.playing
Rayman · Jul 15, 2014 · 3d7f421 · 3d7f421
2 parents 3a62e69 + 710cb71
commit 3d7f421
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/client/views/common/header.html b/client/views/common/header.html
@@ -22,7 +22,6 @@
         <ul class="nav navbar-nav">
           <li class="{{ isActivePath 'playlists' }}"><a href="{{pathFor 'playlists'}}">Playlists</a></li>
           <li class="{{ isActivePath 'loved'     }}"><a href="{{pathFor 'loved'}}">Loved songs</a></li>
-          <li class="{{ isActivePath 'friends'   }}"><a href="{{pathFor 'friends'}}">Friends</a></li>
           <li>
             <a rel="external" href="https://github.com/Rayman/fusic-meteor/issues?state=open">
               <span class="glyphicon glyphicon-exclamation-sign"> </span>Report Issue

diff --git a/collections.js b/collections.js
@@ -48,7 +48,8 @@ UserProfile = new SimpleSchema({
     },
     playing: {
       optional:true,
-      type: [Object]
+      type: Object,
+      blackbox:true,
     }