diff --git a/ruby/lib/jam_ruby/models/search.rb b/ruby/lib/jam_ruby/models/search.rb
index fa1afc71c..217288355 100644
--- a/ruby/lib/jam_ruby/models/search.rb
+++ b/ruby/lib/jam_ruby/models/search.rb
@@ -170,7 +170,7 @@ module JamRuby
counters = { }
counters[COUNT_FRIEND] = Friendship.where(:user_id => uu.id).count
counters[COUNT_FOLLOW] = UserFollowing.where(:user_id => uu.id).count
- counters[COUNT_RECORD] = Recording.where(:owner_id => uu.id).count
+ counters[COUNT_RECORD] = ClaimedRecording.where(:user_id => uu.id).count
counters[COUNT_SESSION] = MusicSession.where(:user_id => uu.id).count
@user_counters[uu.id] << counters
end
diff --git a/ruby/spec/jam_ruby/models/musician_search_spec.rb b/ruby/spec/jam_ruby/models/musician_search_spec.rb
index a9184699c..146d8cc67 100644
--- a/ruby/spec/jam_ruby/models/musician_search_spec.rb
+++ b/ruby/spec/jam_ruby/models/musician_search_spec.rb
@@ -66,7 +66,7 @@ describe User do
results = Search.musician_search({}, @user2)
friend = results.musicians.detect { |mm| mm.id == @user1.id }
friend.should_not == nil
- friend.search_friend_count.to_i.should == 1
+ results.friend_count(friend).should == 1
@user1.reload
friend.friends?(@user2).should == true
results.is_friend?(@user1).should == true
@@ -93,12 +93,12 @@ describe User do
recording.claimed_recordings.length.should == 1
@user1.recordings.detect { |rr| rr == recording }.should_not be nil
- results = Search.musician_search
+ results = Search.musician_search({},@user1)
uu = results.musicians.detect { |mm| mm.id == @user1.id }
uu.should_not == nil
- uu.search_recording_count.to_i.should == 1
- uu.search_session_count.to_i.should == 1
+ results.record_count(uu).should == 1
+ results.session_count(uu).should == 1
end
it "should find all musicians sorted by plays " do
diff --git a/web/app/assets/javascripts/findMusician.js b/web/app/assets/javascripts/findMusician.js
index 4f3db6d07..7a22caa6c 100644
--- a/web/app/assets/javascripts/findMusician.js
+++ b/web/app/assets/javascripts/findMusician.js
@@ -151,21 +151,17 @@
}
function events() {
- $('#musician-keyword-srch').focus(function() {
- $(this).val('');
- });
-
- $("#musician-keyword-srch").keypress(function(evt) {
+ $("#musician_query_distance").keypress(function(evt) {
if (evt.which === 13) {
evt.preventDefault();
- search();
+ refreshDisplay();
}
});
$('#btn-refresh-musicians').on("click", refreshDisplay);
$('#musician-filter-results').bind('scroll', function() {
if ($(this).scrollTop() + $(this).innerHeight() >= $(this)[0].scrollHeight) {
- logger.debug("*** scrolling: page_num="+page_num.toString()+" page_count="+page_count.toString());
+ // logger.debug("*** scrolling: page_num="+page_num.toString()+" page_count="+page_count.toString());
if (page_num < page_count) {
page_num += 1;
search();
diff --git a/web/app/views/clients/_musicians.html.erb b/web/app/views/clients/_musicians.html.erb
index 659d82ad7..51233fd9a 100644
--- a/web/app/views/clients/_musicians.html.erb
+++ b/web/app/views/clients/_musicians.html.erb
@@ -51,7 +51,7 @@
{biography}
PROFILELIKEFRIENDFOLLOW
-