Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixed typo.

Browse source
This commit is contained in:
Martin Edenhofer 2017-02-24 15:02:58 +01:00
parent 2bf34b9404
commit 69e1f7e8c6
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/tickets_controller.rb
View file

@ -324,7 +324,7 @@ class TicketsController < ApplicationController
ticket_master = Ticket.find_by(number: params[:master_ticket_number]) ticket_master = Ticket.find_by(number: params[:master_ticket_number])
if !ticket_master if !ticket_master
render json: { render json: {
result: 'faild', result: 'failed',
message: 'No such master ticket number!', message: 'No such master ticket number!',
} }
return return
@ -337,7 +337,7 @@ class TicketsController < ApplicationController
ticket_slave = Ticket.find_by(id: params[:slave_ticket_id]) ticket_slave = Ticket.find_by(id: params[:slave_ticket_id])
if !ticket_slave if !ticket_slave
render json: { render json: {
result: 'faild', result: 'failed',
message: 'No such slave ticket!', message: 'No such slave ticket!',
} }
return return
@ -349,7 +349,7 @@ class TicketsController < ApplicationController
# check diffetent ticket ids # check diffetent ticket ids
if ticket_slave.id == ticket_master.id if ticket_slave.id == ticket_master.id
render json: { render json: {
result: 'faild', result: 'failed',
message: 'Can\'t merge ticket with it self!', message: 'Can\'t merge ticket with it self!',
} }
return return

2
app/models/user.rb
View file

@ -227,7 +227,7 @@ returns
# check failed logins # check failed logins
max_login_failed = Setting.get('password_max_login_failed').to_i || 10 max_login_failed = Setting.get('password_max_login_failed').to_i || 10
if user && user.login_failed > max_login_failed 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 return false
end end