From 5d5ea51a16d68295672761e6ab7169b59e404853 Mon Sep 17 00:00:00 2001
From: Jonathan Kolyer <jonathan@jamkazam.com>
Date: Sat, 3 Oct 2015 03:17:43 +0000
Subject: [PATCH] VRFS-3459 mixdown ios

---
 ruby/lib/jam_ruby/models/genre_jam_track.rb   | 3 +++
 ruby/lib/jam_ruby/models/jam_track.rb         | 2 +-
 ruby/lib/jam_ruby/models/jam_track_mixdown.rb | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ruby/lib/jam_ruby/models/genre_jam_track.rb b/ruby/lib/jam_ruby/models/genre_jam_track.rb
index 9b6008a3e..933ef26bc 100644
--- a/ruby/lib/jam_ruby/models/genre_jam_track.rb
+++ b/ruby/lib/jam_ruby/models/genre_jam_track.rb
@@ -2,6 +2,9 @@ module JamRuby
   class GenreJamTrack < ActiveRecord::Base
 
     self.table_name = 'genres_jam_tracks'
+
+    attr_accessible :jam_track_id, :genre_id
+
     belongs_to :jam_track, class_name: 'JamRuby::JamTrack', inverse_of: :genres_jam_tracks
     belongs_to :genre, class_name: 'JamRuby::Genre', inverse_of: :genres_jam_tracks
   end
diff --git a/ruby/lib/jam_ruby/models/jam_track.rb b/ruby/lib/jam_ruby/models/jam_track.rb
index 578eaa821..a20a8f0cc 100644
--- a/ruby/lib/jam_ruby/models/jam_track.rb
+++ b/ruby/lib/jam_ruby/models/jam_track.rb
@@ -451,7 +451,7 @@ module JamRuby
     end
 
     def mixdowns_for_user(user)
-      JamTrackMixdown.where(user_id:  user.id).where(jam_track_id: self.id)
+      JamTrackMixdown.where(user_id: user.id, jam_track_id: self.id).order('created_at DESC')
     end
 
     def short_plan_code
diff --git a/ruby/lib/jam_ruby/models/jam_track_mixdown.rb b/ruby/lib/jam_ruby/models/jam_track_mixdown.rb
index 3c6a30bc8..19d6be638 100644
--- a/ruby/lib/jam_ruby/models/jam_track_mixdown.rb
+++ b/ruby/lib/jam_ruby/models/jam_track_mixdown.rb
@@ -16,7 +16,7 @@ module JamRuby
     validates :jam_track, presence: true
     validates :settings, presence: true
 
-    validates_uniqueness_of :name, scope: :user_id
+    validates_uniqueness_of :name, scope: :jam_track_id
 
     validate :verify_settings
     validate :verify_max_mixdowns