added :location option
This commit is contained in:
parent
a6c510a509
commit
3bf3c6f8ae
1 changed files with 5 additions and 4 deletions
|
@ -7,10 +7,11 @@ module ActionController
|
||||||
plist = options.delete(:plist) unless options.nil?
|
plist = options.delete(:plist) unless options.nil?
|
||||||
|
|
||||||
if plist
|
if plist
|
||||||
|
|
||||||
|
response.headers["Location"] = options[:location] unless options[:location].blank?
|
||||||
options[:content_type] ||= Mime::PLIST
|
options[:content_type] ||= Mime::PLIST
|
||||||
options[:disposition] ||= "inline"
|
options[:disposition] ||= "inline"
|
||||||
|
|
||||||
if options[:plist_filename].blank?
|
if options[:plist_filename].blank?
|
||||||
if plist.is_a? Array
|
if plist.is_a? Array
|
||||||
options[:plist_filename] = plist.first.class.name.pluralize + ".plist"
|
options[:plist_filename] = plist.first.class.name.pluralize + ".plist"
|
||||||
|
@ -28,7 +29,7 @@ module ActionController
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
data = plist
|
data = plist
|
||||||
unless plist.is_a?(CFPropertyList::List)
|
unless plist.is_a?(CFPropertyList::List)
|
||||||
plist_options = {
|
plist_options = {
|
||||||
|
@ -37,7 +38,7 @@ module ActionController
|
||||||
}
|
}
|
||||||
data = plist.to_plist(plist_options)
|
data = plist.to_plist(plist_options)
|
||||||
end
|
end
|
||||||
|
|
||||||
send_data(
|
send_data(
|
||||||
data,
|
data,
|
||||||
:type => options[:content_type],
|
:type => options[:content_type],
|
||||||
|
|
Reference in a new issue