jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2286 from evazion/fix-ugoira-api

Browse Source 
Include ugoira data in data attributes and JSON API
This commit is contained in:
Toks
2014-10-26 15:10:05 -04:00
parent 56f9cc9fdb 79395a8b2a
commit 32c0ee55fe
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/post.rb
View File

@@ -1229,8 +1229,14 @@ class Post < ActiveRecord::Base
list list
end end
def associated_attributes
[ :pixiv_ugoira_frame_data ]
end
def serializable_hash(options = {}) def serializable_hash(options = {})
options ||= {} options ||= {}
options[:include] ||= []
options[:include] += associated_attributes
options[:except] ||= [] options[:except] ||= []
options[:except] += hidden_attributes options[:except] += hidden_attributes
unless options[:builder] unless options[:builder]

4
app/views/posts/partials/show/_ugoira.html.erb
View File

@@ -16,7 +16,9 @@
"data-has-children" => post.has_children?, "data-has-children" => post.has_children?,
"data-has-active-children" => post.has_active_children?, "data-has-active-children" => post.has_active_children?,
"data-score" => post.score, "data-score" => post.score,
"data-fav-count" => post.fav_count "data-fav-count" => post.fav_count,
"data-ugoira-frames" => post.pixiv_ugoira_frame_data.data.to_json,
"data-ugoira-content-type" => post.pixiv_ugoira_frame_data.content_type.to_json,
) %> ) %>
<div id="ugoira-controls"> <div id="ugoira-controls">