fix available_locales nil

This commit is contained in:
YingRui Lu 2019-05-03 15:14:42 +08:00
parent c45c48e0e4
commit e92d239e47
2 changed files with 5 additions and 1 deletions

View File

@ -11,7 +11,9 @@ RSpec.describe '<%= resouces_name %>', type: :request do
tags '<%= route_resouces %>' tags '<%= route_resouces %>'
produces 'application/vnd.api+json' produces 'application/vnd.api+json'
parameter name: :'page[number]', in: :query, type: :string, description: '<%= t(:page_num) %>', required: false parameter name: :'page[number]', in: :query, type: :string, description: '<%= t(:page_num) %>', required: false
<% if relationships.present? -%>
parameter name: :include, in: :query, type: :string, description: '<%= t(:include_related_data) %>', required: false parameter name: :include, in: :query, type: :string, description: '<%= t(:include_related_data) %>', required: false
<% end -%>
<% filters.each do |filter_attr, filter_config| -%> <% filters.each do |filter_attr, filter_config| -%>
parameter name: :'filter[<%= filter_attr %>]', in: :query, type: :string, description: '<%= t(:filter_field) %>', <% if filter_config[:default] -%>default: '<%= safe_encode(filter_config[:default]) %>',<% end %>required: false parameter name: :'filter[<%= filter_attr %>]', in: :query, type: :string, description: '<%= t(:filter_field) %>', <% if filter_config[:default] -%>default: '<%= safe_encode(filter_config[:default]) %>',<% end %>required: false
<% end -%> <% end -%>
@ -99,7 +101,9 @@ RSpec.describe '<%= resouces_name %>', type: :request do
tags '<%= route_resouces %>' tags '<%= route_resouces %>'
produces 'application/vnd.api+json' produces 'application/vnd.api+json'
parameter name: :id, in: :path, type: :integer, description: 'ID', required: true parameter name: :id, in: :path, type: :integer, description: 'ID', required: true
<% if relationships.present? -%>
parameter name: :include, in: :query, type: :string, description: '<%= t(:include_related_data) %>', required: false parameter name: :include, in: :query, type: :string, description: '<%= t(:include_related_data) %>', required: false
<% end -%>
parameter name: :'fields[<%= route_resouces %>]', in: :query, type: :string, description: '<%= t(:display_field) %>', required: false parameter name: :'fields[<%= route_resouces %>]', in: :query, type: :string, description: '<%= t(:display_field) %>', required: false
<% relationships.each_value do |relation| -%> <% relationships.each_value do |relation| -%>
parameter name: :'fields[<%= relation.class_name.tableize %>]', in: :query, type: :string, description: '<%= t(:display_field) %>', required: false parameter name: :'fields[<%= relation.class_name.tableize %>]', in: :query, type: :string, description: '<%= t(:display_field) %>', required: false

View File

@ -6,7 +6,7 @@ module Jsonapi
initializer 'jsonapi-swagger-i18n' do |app| initializer 'jsonapi-swagger-i18n' do |app|
locates = app.config.i18n.available_locales locates = app.config.i18n.available_locales
locates_dir = File.expand_path('../../i18n', __dir__) locates_dir = File.expand_path('../../i18n', __dir__)
locates.each do |loc| Array(locates).each do |loc|
locate_file = File.join(locates_dir, "#{loc}.yml") locate_file = File.join(locates_dir, "#{loc}.yml")
I18n.load_path.push(locate_file) if File.exist?(locate_file) && !I18n.load_path.include?(locate_file) I18n.load_path.push(locate_file) if File.exist?(locate_file) && !I18n.load_path.include?(locate_file)
end end