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

Merge branch 'develop' of github.com:martini/zammad into develop

Browse source
This commit is contained in:
Felix Niklas 2015-08-04 16:56:42 +02:00
commit 2cea7d804b
3 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/app/controllers/_application_controller_form.js.coffee
View file

@ -1051,7 +1051,7 @@ class App.ControllerForm extends App.Controller
$( item[0] ).on('focus', -> $( item[0] ).on('focus', ->
visible = $( item[0] ).is(":visible") visible = $( item[0] ).is(":visible")
if visible && !$( item[0] ).expanding('active') if visible && !$( item[0] ).expanding('active')
$( item[0] ).expanding() $( item[0] ).expanding().focus()
) )
App.Delay.set( a, 80 ) App.Delay.set( a, 80 )

2
app/controllers/search_controller.rb
View file

@ -34,7 +34,6 @@ class SearchController < ApplicationController
limit: limit, limit: limit,
current_user: current_user, current_user: current_user,
) )
user_result = []
users.each do |user| users.each do |user|
item = { item = {
id: user.id, id: user.id,
@ -50,7 +49,6 @@ class SearchController < ApplicationController
current_user: current_user, current_user: current_user,
) )
organization_result = []
organizations.each do |organization| organizations.each do |organization|
item = { item = {
id: organization.id, id: organization.id,

2
lib/import/otrs.rb
View file

@ -304,7 +304,7 @@ module Import::OTRS
result = request_json({}) result = request_json({})
if !result['Success'] if !result['Success']
'API key not valid!' fail 'API key not valid!'
end end
# set settings # set settings