Fixed language change.
This commit is contained in:
parent
c36993fd18
commit
b531b74bf7
3 changed files with 31 additions and 9 deletions
|
@ -25,7 +25,7 @@ class Index extends App.Controller
|
|||
update: (e) =>
|
||||
e.preventDefault()
|
||||
params = @formParam(e.target)
|
||||
error = @form.validate(params)
|
||||
error = @form.validate(params)
|
||||
if error
|
||||
@formValidate( form: e.target, errors: error )
|
||||
return false
|
||||
|
@ -35,13 +35,13 @@ class Index extends App.Controller
|
|||
# get data
|
||||
@locale = params['locale']
|
||||
@ajax(
|
||||
id: 'preferences'
|
||||
type: 'PUT'
|
||||
url: @apiPath + '/users/preferences'
|
||||
data: JSON.stringify(params)
|
||||
id: 'preferences'
|
||||
type: 'PUT'
|
||||
url: @apiPath + '/users/preferences'
|
||||
data: JSON.stringify({user:params})
|
||||
processData: true
|
||||
success: @success
|
||||
error: @error
|
||||
success: @success
|
||||
error: @error
|
||||
)
|
||||
|
||||
success: (data, status, xhr) =>
|
||||
|
|
|
@ -509,8 +509,8 @@ curl http://localhost/api/v1/users/preferences.json -v -u #{login}:#{password} -
|
|||
params[:user].each {|key, value|
|
||||
current_user.preferences[key.to_sym] = value
|
||||
}
|
||||
current_user.save
|
||||
end
|
||||
current_user.save
|
||||
render :json => { :message => 'ok' }, :status => :ok
|
||||
end
|
||||
|
||||
|
|
|
@ -47,6 +47,28 @@ class PreferencesTest < TestCase
|
|||
:area => 'body',
|
||||
:value => 'Language',
|
||||
},
|
||||
{
|
||||
:execute => 'select',
|
||||
:css => '.language_item select[name="locale"]',
|
||||
:value => 'Deutsch',
|
||||
},
|
||||
{
|
||||
:execute => 'click',
|
||||
:css => '.content button[type="submit"]',
|
||||
},
|
||||
{
|
||||
:execute => 'watch_for',
|
||||
:area => 'body',
|
||||
:value => 'Sprache',
|
||||
},
|
||||
{
|
||||
:execute => 'reload',
|
||||
},
|
||||
{
|
||||
:execute => 'watch_for',
|
||||
:area => 'body',
|
||||
:value => 'Sprache',
|
||||
},
|
||||
],
|
||||
},
|
||||
]
|
||||
|
|
Loading…
Reference in a new issue