Edit button leaves modal open

Add user avatar to user selection

app/assets/javascripts/gl_dropdown.js.coffee

@@ -197,7 +197,6 @@ class GitLabDropdown
       @dropdown.find(".dropdown-input-field").focus()
   hidden: (e) =>
-
     if @options.filterable
       @dropdown
         .find(".dropdown-input-field")

app/assets/javascripts/issuable_context.js.coffee

@@ -10,11 +10,18 @@ class @IssuableContext
       $(this).submit()
     $(document).on "click",".edit-link", (e) ->
-      block = $(@).parents('.block')
-      block.find('.selectbox').show()
-      block.find('.value').hide()
+      $block = $(@).parents('.block')
+      $selectbox = $block.find('.selectbox')
+      if $selectbox.is(':visible')
+        $selectbox.hide()
+        $block.find('.value').show()
+      else
+        $selectbox.show()
+        $block.find('.value').hide()
+
+      if $selectbox.is(':visible')
         setTimeout (->
-        block.find('.dropdown-menu-toggle').trigger 'click'
+          $block.find('.dropdown-menu-toggle').trigger 'click'
         ), 0
       

app/assets/javascripts/users_select.js.coffee

@@ -45,7 +45,7 @@ class @UsersSelect
             user =
               name: data.assignee.name
               username: data.assignee.username
-              avatar: data.assignee.avatar.url
+              avatar: data.assignee.avatar_url
           else
             user =
               name: 'Unassigned'
@@ -129,7 +129,7 @@ class @UsersSelect
         inputId: 'issue_assignee_id'
-        hidden: ->
+        hidden: (e) ->
           $selectbox.hide()
           $value.show()

app/controllers/projects/issues_controller.rb

@@ -113,7 +113,7 @@ class Projects::IssuesController < Projects::ApplicationController
         end
       end
       format.json do
-        render json: @issue.to_json(include: [:milestone, :labels, :assignee])
+        render json: @issue.to_json(include: [:milestone, :labels, assignee: { methods: :avatar_url }])
       end
     end
   end