From 386ed8144c2d70447ae203c5a5e0b6afad25f654 Mon Sep 17 00:00:00 2001 From: Seth Call Date: Sun, 6 Sep 2015 19:03:08 -0500 Subject: [PATCH] * VRFS-3528 - make sure open jamtrack dialog passes 'show_purchased_only' --- ruby/lib/jam_ruby/models/jam_track.rb | 7 +++++++ .../react-components/JamTrackAutoComplete.js.jsx.coffee | 9 +++++++-- web/app/views/dialogs/_openJamTrackDialog.html.slim | 2 +- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/ruby/lib/jam_ruby/models/jam_track.rb b/ruby/lib/jam_ruby/models/jam_track.rb index acbc2df32..29995e9ad 100644 --- a/ruby/lib/jam_ruby/models/jam_track.rb +++ b/ruby/lib/jam_ruby/models/jam_track.rb @@ -230,6 +230,8 @@ module JamRuby return {artists: [], songs: []} end + options[:show_purchased_only] = options[:show_purchased_only] + options[:limit] = options[:limit] || 5 options[:artist_search] = options[:match] @@ -387,6 +389,11 @@ module JamRuby query = query.where("jam_tracks.status = ?", 'Production') unless user.admin + if options[:show_purchased_only] + query = query.joins(:jam_track_rights) + query = query.where("jam_track_rights.user_id = ?", user.id) + end + if options[:artist_search] tsquery = Search.create_tsquery(options[:artist_search]) if tsquery diff --git a/web/app/assets/javascripts/react-components/JamTrackAutoComplete.js.jsx.coffee b/web/app/assets/javascripts/react-components/JamTrackAutoComplete.js.jsx.coffee index 3eeacdf14..f1bf96cc4 100644 --- a/web/app/assets/javascripts/react-components/JamTrackAutoComplete.js.jsx.coffee +++ b/web/app/assets/javascripts/react-components/JamTrackAutoComplete.js.jsx.coffee @@ -77,7 +77,7 @@ MIX_MODES = context.JK.MIX_MODES #@search() - getOptions: (input, callback) => + getOptions: (input, callback) -> #@logger.debug("getOptions input #{input}", this) @@ -88,7 +88,12 @@ MIX_MODES = context.JK.MIX_MODES callback(null, {options: [], complete: false}) return - @rest.autocompleteJamTracks({match:input, limit:5}) + query = {match:input, limit:5} + + if @props.show_purchased_only + query.show_purchased_only = true + + @rest.autocompleteJamTracks(query) .done((autocomplete) => options = [] diff --git a/web/app/views/dialogs/_openJamTrackDialog.html.slim b/web/app/views/dialogs/_openJamTrackDialog.html.slim index 994540ed5..e2e85dd69 100644 --- a/web/app/views/dialogs/_openJamTrackDialog.html.slim +++ b/web/app/views/dialogs/_openJamTrackDialog.html.slim @@ -7,7 +7,7 @@ .dialog-inner - = react_component 'JamTrackAutoComplete', {:onSearch => 'window.JK.OpenJamTrackDialogInstance.search'} + = react_component 'JamTrackAutoComplete', {:onSearch => 'window.JK.OpenJamTrackDialogInstance.search', show_purchased_only:true} button.search-btn.button-orange SEARCH .recording-wrapper