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

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 )
 

app/assets/javascripts/app/lib/app_post/searchable_select.js.coffee

@@ -1,16 +1,17 @@
 class App.SearchableSelect extends Spine.Controller
 
   events:
-    'input .js-input':                 'filterList'
+    'input .js-input':                  'onInput'
-    'click .js-value':                 'selectItem'
+    'click .js-option':                 'selectItem'
-    'mouseenter .js-value':            'highlightItem'
+    'mouseenter .js-option':            'highlightItem'
     'shown.bs.dropdown':  'onDropdownShown'
     'hidden.bs.dropdown': 'onDropdownHidden'
 
   elements:
-    '.js-value': 'values'
+    '.js-option': 'option_items'
     '.js-input': 'input'
     '.js-shadow': 'shadowInput'
+    '.js-optionsList': 'optionsList'
 
   className: 'searchableSelect dropdown dropdown--actions'
 
@@ -22,12 +23,16 @@ class App.SearchableSelect extends Spine.Controller
     @render()
 
   render: ->
+    console.log "options", @options
     firstSelected = _.find @options.attribute.options, (option) -> option.selected
 
     if firstSelected
       @options.attribute.valueName = firstSelected.name
       @options.attribute.value = firstSelected.value
 
+    @options.attribute.renderedOptions = App.view('generic/searchable_select_options')
+      options: @options.attribute.options
+
     @html App.view('generic/searchable_select')( @options.attribute )
 
     @input.on 'keydown', @navigate
@@ -39,7 +44,7 @@ class App.SearchableSelect extends Spine.Controller
 
   onDropdownHidden: =>
     @input.off 'click', @stopPropagation
-    @values.removeClass '.is-active'
+    @option_items.removeClass '.is-active'
     @isOpen = false
 
   toggle: =>
@@ -63,17 +68,17 @@ class App.SearchableSelect extends Spine.Controller
     return @toggle() if not @isOpen
 
     event.preventDefault()
-    visibleValues = @values.not('.is-hidden')
+    visibleOptions = @option_items.not('.is-hidden')
-    highlightedItem = @values.filter('.is-active')
+    highlightedItem = @option_items.filter('.is-active')
-    currentPosition = visibleValues.index(highlightedItem)
+    currentPosition = visibleOptions.index(highlightedItem)
 
     currentPosition += direction
 
     return if currentPosition < 0
-    return if currentPosition > visibleValues.size() - 1
+    return if currentPosition > visibleOptions.size() - 1
 
-    @values.removeClass('is-active')
+    @option_items.removeClass('is-active')
-    visibleValues.eq(currentPosition).addClass('is-active')
+    visibleOptions.eq(currentPosition).addClass('is-active')
 
   selectItem: (event) ->
     @input.val event.currentTarget.textContent.trim()
@@ -94,22 +99,22 @@ class App.SearchableSelect extends Spine.Controller
 
     event.preventDefault()
 
-    @input.val @values.filter('.is-active').text().trim()
+    @input.val @option_items.filter('.is-active').text().trim()
     @input.trigger('change')
-    @shadowInput.val @values.filter('.is-active').attr('data-value')
+    @shadowInput.val @option_items.filter('.is-active').attr('data-value')
     @shadowInput.trigger('change')
     @toggle()
 
-  filterList: (event) =>
+  onInput: (event) =>
     @toggle() if not @isOpen
 
-    query = @input.val()
+    @query = @input.val()
-    @filterByQuery query
+    @filterByQuery @query
 
   filterByQuery: (query) ->
     regex = new RegExp(query.split(' ').join('.*'), 'i')
 
-    @values
+    @option_items
       .addClass 'is-hidden'
       .filter ->
         this.textContent.match(regex)
@@ -118,8 +123,8 @@ class App.SearchableSelect extends Spine.Controller
     @highlightFirst()
 
   highlightFirst: ->
-    @values.removeClass('is-active').not('.is-hidden').first().addClass 'is-active'
+    @option_items.removeClass('is-active').not('.is-hidden').first().addClass 'is-active'
 
   highlightItem: (event) =>
-    @values.removeClass('is-active')
+    @option_items.removeClass('is-active')
     $(event.currentTarget).addClass('is-active')

app/assets/javascripts/app/lib/app_post/z_searchable_ajax_select.js.coffee

@@ -0,0 +1,14 @@
+class App.SearchableAjaxSelect extends App.SearchableSelect
+
+  onInput: (event) =>
+    super
+
+    # send ajax request @query
+
+  onAjaxResponse: (data) =>
+    @optionsList.html App.view('generic/searchable_select_options')
+      options: data
+
+    @refreshElements()
+
+    @filterByQuery @query

app/assets/javascripts/app/views/generic/searchable_select.jst.eco

@@ -14,8 +14,6 @@
   >
   <svg class="icon-arrow-down"><use xlink:href="#icon-arrow-down" /></svg>
 </div>
-<ul class="dropdown-menu dropdown-menu-left" role="menu">
+<ul class="dropdown-menu dropdown-menu-left js-optionsList" role="menu">
-<% for row in @options: %>
+  <%- @renderedOptions %>
-  <li role="presentation" class="js-value" data-value="<%= row.value %>"><%= row.name %>
-<% end %>
 </ul>

app/assets/javascripts/app/views/generic/searchable_select_options.jst.eco

@@ -0,0 +1,3 @@
+<% for option in @options: %>
+  <li role="presentation" class="js-option" data-value="<%= option.value %>"><%= option.name %>
+<% end %>

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,

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