Project

General

Profile

« Previous | Next » 

Revision 807f8b66

Added by Tomáš Strachota over 9 years ago

Fixes #9113 - api docs for users miss locale and timestamp params

Locale was missing also in the server responses.

View differences:

app/controllers/api/v2/users_controller.rb
param :default_location_id, Integer if SETTINGS[:locations_enabled]
param :default_organization_id, Integer if SETTINGS[:organizations_enabled]
param :auth_source_id, Integer, :required => true
param :timezone, String, :required => false
param :timezone, ActiveSupport::TimeZone.zones_map.keys, :required => false, :desc => N_("User's timezone")
param :locale, FastGettext.available_locales, :required => false, :desc => N_("User's preferred locale")
param_group :taxonomies, ::Api::V2::BaseController
end
end
app/views/api/v2/users/main.json.rabl
extends "api/v2/users/base"
attributes :firstname, :lastname, :mail, :admin, :auth_source_id, :auth_source_name, :timezone, :last_login_on, :created_at, :updated_at
attributes :firstname, :lastname, :mail, :admin, :auth_source_id, :auth_source_name, :timezone, :locale, :last_login_on, :created_at, :updated_at
if SETTINGS[:locations_enabled]
child :default_location => :default_location do

Also available in: Unified diff