diff options
| author | re4k <re4k@re4k.info> | 2013-03-23 22:07:25 +0900 |
|---|---|---|
| committer | re4k <re4k@re4k.info> | 2013-03-23 22:07:25 +0900 |
| commit | c40c306bac93950ff83e65d05eede0e5cf54edc3 (patch) | |
| tree | e3022aa78f0db7359258cd56eb23fb4b1f432263 /app/views/shared | |
| parent | 80eca202c9ae3b3a6098c1654a530b1cd46326cf (diff) | |
| download | aclog-c40c306bac93950ff83e65d05eede0e5cf54edc3.tar.gz | |
Implement JSON API
Diffstat (limited to 'app/views/shared')
| -rw-r--r-- | app/views/shared/_tweet.html.haml | 2 | ||||
| -rw-r--r-- | app/views/shared/_tweet.json.jbuilder | 24 | ||||
| -rw-r--r-- | app/views/shared/_user_nav.html.haml | 2 |
3 files changed, 19 insertions, 9 deletions
diff --git a/app/views/shared/_tweet.html.haml b/app/views/shared/_tweet.html.haml index e706079..4d40f69 100644 --- a/app/views/shared/_tweet.html.haml +++ b/app/views/shared/_tweet.html.haml @@ -15,7 +15,7 @@ %span.twitter_bird = link_to image_tag("bird_gray_16.png", :alt => "Twitter"), twitter_status_url(item), :target => "_blank" %span.created_at - = link_to format_tweet_created_at(item.tweeted_at), :controller => "users", :action => "show", :id => item.id + = link_to format_tweet_created_at(item.tweeted_at), :controller => "i", :action => "show", :id => item.id %span.source = raw format_source_text(item.source) .stats diff --git a/app/views/shared/_tweet.json.jbuilder b/app/views/shared/_tweet.json.jbuilder index a6c22ae..467249a 100644 --- a/app/views/shared/_tweet.json.jbuilder +++ b/app/views/shared/_tweet.json.jbuilder @@ -1,18 +1,28 @@ json.(item, :id, :text, :source, :tweeted_at, :favorites_count, :retweets_count) json.user do |json| - json.partial! "shared/user", :user => item.user + unless @include_user + json.id item.user_id + else + json.partial! "shared/user", :user => item.user + end end -unless @trim_user - json.favorites item.favorites.order("id") do |json, favorite| - json.user do |json| +json.favorites item.favorites.order("id") do |json, favorite| + json.user do |json| + unless @include_user + json.id favorite.user_id + else json.partial! "shared/user", :user => favorite.user || User.new end end - json.retweets item.retweets.order("id") do |json, retweet| - json.id retweet.id - json.user do |json| +end +json.retweets item.retweets.order("id") do |json, retweet| + json.id retweet.id + json.user do |json| + unless @include_user + json.id retweet.user_id + else json.partial! "shared/user", :user => retweet.user || User.new end end diff --git a/app/views/shared/_user_nav.html.haml b/app/views/shared/_user_nav.html.haml index 93c7d35..f7a3c7b 100644 --- a/app/views/shared/_user_nav.html.haml +++ b/app/views/shared/_user_nav.html.haml @@ -8,4 +8,4 @@ %li = link_to "Timeline", :controller => "users", :action => "timeline", :screen_name => user.screen_name %li - = link_to "Discovered", :controller => "users", :action => "my", :screen_name => user.screen_name + = link_to "Discovered", :controller => "users", :action => "discovered", :screen_name => user.screen_name |