Fixed typo.
This commit is contained in:
parent
2bf34b9404
commit
69e1f7e8c6
2 changed files with 4 additions and 4 deletions
|
@ -324,7 +324,7 @@ class TicketsController < ApplicationController
|
|||
ticket_master = Ticket.find_by(number: params[:master_ticket_number])
|
||||
if !ticket_master
|
||||
render json: {
|
||||
result: 'faild',
|
||||
result: 'failed',
|
||||
message: 'No such master ticket number!',
|
||||
}
|
||||
return
|
||||
|
@ -337,7 +337,7 @@ class TicketsController < ApplicationController
|
|||
ticket_slave = Ticket.find_by(id: params[:slave_ticket_id])
|
||||
if !ticket_slave
|
||||
render json: {
|
||||
result: 'faild',
|
||||
result: 'failed',
|
||||
message: 'No such slave ticket!',
|
||||
}
|
||||
return
|
||||
|
@ -349,7 +349,7 @@ class TicketsController < ApplicationController
|
|||
# check diffetent ticket ids
|
||||
if ticket_slave.id == ticket_master.id
|
||||
render json: {
|
||||
result: 'faild',
|
||||
result: 'failed',
|
||||
message: 'Can\'t merge ticket with it self!',
|
||||
}
|
||||
return
|
||||
|
|
|
@ -227,7 +227,7 @@ returns
|
|||
# check failed logins
|
||||
max_login_failed = Setting.get('password_max_login_failed').to_i || 10
|
||||
if user && user.login_failed > max_login_failed
|
||||
logger.info "Max login faild reached for user #{user.login}."
|
||||
logger.info "Max login failed reached for user #{user.login}."
|
||||
return false
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in a new issue