Fixed typos.
This commit is contained in:
parent
85abb738d8
commit
9953a6b450
7 changed files with 8 additions and 8 deletions
|
@ -142,7 +142,7 @@ class Index extends App.ControllerContent
|
||||||
# add notify
|
# add notify
|
||||||
@notify
|
@notify
|
||||||
type: 'error'
|
type: 'error'
|
||||||
msg: App.i18n.translateContent(details.error || 'Wrong Username and Password combination.')
|
msg: App.i18n.translateContent(details.error || 'Wrong Username or Password combination.')
|
||||||
removeAll: true
|
removeAll: true
|
||||||
|
|
||||||
# rerender login page
|
# rerender login page
|
||||||
|
|
|
@ -95,7 +95,7 @@ class Index extends App.ControllerContent
|
||||||
|
|
||||||
@notify
|
@notify
|
||||||
type: 'error'
|
type: 'error'
|
||||||
msg: App.i18n.translateContent(details.error || 'Wrong Username and Password combination.')
|
msg: App.i18n.translateContent(details.error || 'Wrong Username or Password combination.')
|
||||||
removeAll: true
|
removeAll: true
|
||||||
|
|
||||||
App.Config.set('signup', Index, 'Routes')
|
App.Config.set('signup', Index, 'Routes')
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
class App.Permission extends App.Model
|
class App.Permission extends App.Model
|
||||||
@configure 'Role', 'name', 'note', 'active', 'updated_at'
|
@configure 'Permission', 'name', 'note', 'active'
|
||||||
@extend Spine.Model.Ajax
|
@extend Spine.Model.Ajax
|
||||||
@url: @apiPath + '/permissions'
|
@url: @apiPath + '/permissions'
|
||||||
|
|
|
@ -17,7 +17,7 @@ class SessionsController < ApplicationController
|
||||||
check_maintenance(user)
|
check_maintenance(user)
|
||||||
|
|
||||||
# auth failed
|
# auth failed
|
||||||
raise Exceptions::NotAuthorized, 'Wrong Username and Password combination.' if !user
|
raise Exceptions::NotAuthorized, 'Wrong Username or Password combination.' if !user
|
||||||
|
|
||||||
# remember me - set session cookie to expire later
|
# remember me - set session cookie to expire later
|
||||||
expire_after = nil
|
expire_after = nil
|
||||||
|
|
|
@ -14,7 +14,7 @@ module Channel::Filter::OwnNotificationLoopDetection
|
||||||
return if message_id !~ /@#{Regexp.quote(fqdn)}>/i
|
return if message_id !~ /@#{Regexp.quote(fqdn)}>/i
|
||||||
|
|
||||||
mail[ 'x-zammad-ignore'.to_sym ] = true
|
mail[ 'x-zammad-ignore'.to_sym ] = true
|
||||||
Rails.logger.info "Detected onw sent notification mail and dropped it to prevent loops (message_id: #{message_id}, from: #{mail[:from]}, to: #{mail[:to]})"
|
Rails.logger.info "Detected own sent notification mail and dropped it to prevent loops (message_id: #{message_id}, from: #{mail[:from]}, to: #{mail[:to]})"
|
||||||
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -3493,7 +3493,7 @@ wait untill text in selector disabppears
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
rescue
|
rescue
|
||||||
# faild to get logs
|
# failed to get logs
|
||||||
end
|
end
|
||||||
return if !@@debug
|
return if !@@debug
|
||||||
return if params[:mute_log]
|
return if params[:mute_log]
|
||||||
|
|
|
@ -66,14 +66,14 @@ class AuthTest < ActiveSupport::TestCase
|
||||||
user = User.authenticate(test[:username], test[:password])
|
user = User.authenticate(test[:username], test[:password])
|
||||||
if test[:result] == true
|
if test[:result] == true
|
||||||
if !user
|
if !user
|
||||||
assert(false, 'auth faild')
|
assert(false, 'auth failed')
|
||||||
else
|
else
|
||||||
test[:verify].each { |key, value|
|
test[:verify].each { |key, value|
|
||||||
assert_equal(user[key], value, 'verify')
|
assert_equal(user[key], value, 'verify')
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
assert_equal(test[:result], user, 'faild or not existing')
|
assert_equal(test[:result], user, 'failed or not existing')
|
||||||
end
|
end
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue