From 3fa58715fcf0aa63017e0be42e7f5b0ac4b9b8ac Mon Sep 17 00:00:00 2001 From: Seth Call Date: Wed, 19 Aug 2015 07:36:04 -0500 Subject: [PATCH] * fix open jamtrack dialog for people with less than 10 jamtracks --- .../models/jam_track_hfa_request_spec.rb | 3 +-- .../javascripts/dialog/openJamTrackDialog.js | 27 ++++++++++++------- .../dialogs/_openJamTrackDialog.html.slim | 1 + 3 files changed, 20 insertions(+), 11 deletions(-) diff --git a/ruby/spec/jam_ruby/models/jam_track_hfa_request_spec.rb b/ruby/spec/jam_ruby/models/jam_track_hfa_request_spec.rb index 146a7f565..95eef5d2f 100644 --- a/ruby/spec/jam_ruby/models/jam_track_hfa_request_spec.rb +++ b/ruby/spec/jam_ruby/models/jam_track_hfa_request_spec.rb @@ -4,7 +4,6 @@ describe JamTrackHfaRequest do include CarrierWave::Test::Matchers include UsesTempFiles - #let(:jamtrack1) {FactoryGirl.create(:jam_track, hfa_license_status: false, hfa_license_desired: true, alternative_license_status: false) let(:jamtrack1) {FactoryGirl.create(:jam_track, duration: 90, server_fixation_date: Time.now.to_date ) } it "creates request" do @@ -18,7 +17,7 @@ describe JamTrackHfaRequest do request.request_csv_filename.should_not be_nil request.approved_at.should be_nil request.received_at.should be_nil - + request_id = JamTrackHfaRequestId.first request_id.request_id.should_not be_nil diff --git a/web/app/assets/javascripts/dialog/openJamTrackDialog.js b/web/app/assets/javascripts/dialog/openJamTrackDialog.js index 59714f818..9d46a724f 100644 --- a/web/app/assets/javascripts/dialog/openJamTrackDialog.js +++ b/web/app/assets/javascripts/dialog/openJamTrackDialog.js @@ -39,7 +39,12 @@ app.user().done(function(user) { - if (user.purchased_jamtracks_count > perPage) { + var showSearch = (user.purchased_jamtracks_count > perPage) + + var $autocomplete = $dialog.find('[data-react-class="JamTrackAutoComplete"]') + if (showSearch) { + $autocomplete.show() + $searchBtn.show() searchQuery = $.cookie(cookieName) if (!searchQuery) { @@ -54,15 +59,19 @@ logger.error("unable to parse search query: " + e) } } - - - getPurchasedJamTracks(0) - .done(function (data, textStatus, jqXHR) { - // initialize pagination - var $paginator = context.JK.Paginator.create(parseInt(jqXHR.getResponseHeader('total-entries')), perPage, 0, onPageSelected, 20) - $paginatorHolder.append($paginator); - }); } + else { + $autocomplete.hide() + $searchBtn.hide() + } + + getPurchasedJamTracks(0) + .done(function (data, textStatus, jqXHR) { + // initialize pagination + var $paginator = context.JK.Paginator.create(parseInt(jqXHR.getResponseHeader('total-entries')), perPage, 0, onPageSelected, 20) + $paginatorHolder.append($paginator); + }); + }) } diff --git a/web/app/views/dialogs/_openJamTrackDialog.html.slim b/web/app/views/dialogs/_openJamTrackDialog.html.slim index 8a5b0ed26..994540ed5 100644 --- a/web/app/views/dialogs/_openJamTrackDialog.html.slim +++ b/web/app/views/dialogs/_openJamTrackDialog.html.slim @@ -8,6 +8,7 @@ .dialog-inner = react_component 'JamTrackAutoComplete', {:onSearch => 'window.JK.OpenJamTrackDialogInstance.search'} + button.search-btn.button-orange SEARCH .recording-wrapper table.open-jam-tracks cellspacing="0" cellpadding="0" border="0"