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

fixes #2444

Browse Source
This commit is contained in:
r888888888
2015-07-21 13:42:32 -07:00
parent 9e6d08600c
commit d8f639e721
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/application_controller.rb
View File

@@ -18,6 +18,10 @@ class ApplicationController < ActionController::Base
rescue_from Danbooru::Paginator::PaginationError, :with => :render_pagination_limit rescue_from Danbooru::Paginator::PaginationError, :with => :render_pagination_limit
protected protected
def enable_cors
response.headers["Access-Control-Allow-Origin"] = "*"
end
def api_check def api_check
if request.format.to_s =~ /\/json|\/xml/ || params[:controller] == "iqdb" if request.format.to_s =~ /\/json|\/xml/ || params[:controller] == "iqdb"
if ApiLimiter.throttled?(request.remote_ip) if ApiLimiter.throttled?(request.remote_ip)

1
app/controllers/posts_controller.rb
View File

@@ -1,6 +1,7 @@
class PostsController < ApplicationController class PostsController < ApplicationController
before_filter :member_only, :except => [:show, :show_seq, :index, :home, :random] before_filter :member_only, :except => [:show, :show_seq, :index, :home, :random]
before_filter :builder_only, :only => [:copy_notes] before_filter :builder_only, :only => [:copy_notes]
before_filter :enable_cors, :only => [:index, :show]
after_filter :save_recent_tags, :only => [:update] after_filter :save_recent_tags, :only => [:update]
respond_to :html, :xml, :json respond_to :html, :xml, :json
rescue_from PostSets::SearchError, :with => :rescue_exception rescue_from PostSets::SearchError, :with => :rescue_exception