From c954abcc371a0d6163781dd928b11fd7cc7ec7de Mon Sep 17 00:00:00 2001 From: Thorsten Eckel Date: Tue, 4 Aug 2015 11:52:58 +0200 Subject: [PATCH 1/3] Added missing exception. --- lib/import/otrs.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From f1950bf66d929167bb5e8367ccf083756761e0b4 Mon Sep 17 00:00:00 2001 From: Thorsten Eckel Date: Tue, 4 Aug 2015 11:53:22 +0200 Subject: [PATCH 2/3] Removed useless variables. --- app/controllers/search_controller.rb | 2 -- 1 file changed, 2 deletions(-) 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, From 2b444656a221ad929ef66147c5a38096ecf16fe9 Mon Sep 17 00:00:00 2001 From: Thorsten Eckel Date: Tue, 4 Aug 2015 14:22:02 +0200 Subject: [PATCH 3/3] Fixed bug: Element loses focus when accessed via tab. --- .../app/controllers/_application_controller_form.js.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 )