seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

supply link on facebook share - VRFS-1376

This commit is contained in:
Seth Call 2014-03-10 16:24:36 +00:00
parent a2061ff830
commit 030d31eadc
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ruby/spec/jam_ruby/models/feed_spec.rb
View File

@ -158,8 +158,8 @@ describe Feed do
# creates both recording and history record in feed
claimed_recording1 = FactoryGirl.create(:claimed_recording)
# move the feed entry created for the recording back more than a months ago
claimed_recording1.recording.feed.created_at = 25.hours.ago
# move the feed entry created for the recording back more than a day ago
claimed_recording1.recording.feed.created_at = 48.hours.ago
claimed_recording1.recording.feed.save!
feeds, start = Feed.index(user1, :type => 'recording', time_range: 'today')

6
web/app/assets/javascripts/shareDialog.js
View File

@ -106,7 +106,8 @@
description: data.description,
caption: data.caption,
name: data.title,
picture: data.photo_url
picture: data.photo_url,
link: data.url
})
.done(function(response) {
checkShareCheckbox('facebook', false);
@ -163,7 +164,8 @@
description: data.description,
caption: data.caption,
name: data.title,
picture: data.photo_url
picture: data.photo_url,
link: data.url
})
.done(function(response) {
checkShareCheckbox('facebook', false);

2
web/app/controllers/api_users_controller.rb
View File

@ -531,6 +531,7 @@ class ApiUsersController < ApiController
description: view_context.description_for_music_session_history(history),
title: view_context.title_for_music_session_history(history, current_user),
photo_url: view_context.facebook_image_for_music_session_history(history),
url: share_token_url(history.share_token.token),
caption: 'www.jamkazam.com'
}, status: 200
@ -557,6 +558,7 @@ class ApiUsersController < ApiController
description: view_context.description_for_claimed_recording(claimed_recording),
title: view_context.title_for_claimed_recording(claimed_recording, current_user),
photo_url: view_context.facebook_image_for_claimed_recording(claimed_recording),
url: share_token_url(claimed_recording.share_token.token),
caption: 'www.jamkazam.com'
}, status: 200