diff --git a/app/assets/javascripts/app/controllers/_application_controller_form.js.coffee b/app/assets/javascripts/app/controllers/_application_controller_form.js.coffee index 66e3b2c00..d0ad04638 100644 --- a/app/assets/javascripts/app/controllers/_application_controller_form.js.coffee +++ b/app/assets/javascripts/app/controllers/_application_controller_form.js.coffee @@ -1051,7 +1051,7 @@ class App.ControllerForm extends App.Controller $( item[0] ).on('focus', -> visible = $( item[0] ).is(":visible") if visible && !$( item[0] ).expanding('active') - $( item[0] ).expanding() + $( item[0] ).expanding().focus() ) App.Delay.set( a, 80 ) diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb index 0bdd2e340..3d2e79fc1 100644 --- a/app/controllers/search_controller.rb +++ b/app/controllers/search_controller.rb @@ -34,7 +34,6 @@ class SearchController < ApplicationController limit: limit, current_user: current_user, ) - user_result = [] users.each do |user| item = { id: user.id, @@ -50,7 +49,6 @@ class SearchController < ApplicationController current_user: current_user, ) - organization_result = [] organizations.each do |organization| item = { id: organization.id, diff --git a/lib/import/otrs.rb b/lib/import/otrs.rb index d655deda2..fa66476f7 100644 --- a/lib/import/otrs.rb +++ b/lib/import/otrs.rb @@ -304,7 +304,7 @@ module Import::OTRS result = request_json({}) if !result['Success'] - 'API key not valid!' + fail 'API key not valid!' end # set settings