From 5c4416bb45c2c61e99517c594cdd3b8dea1dc829 Mon Sep 17 00:00:00 2001 From: Phil Hughes Date: Mon, 16 May 2016 15:24:51 +0100 Subject: Loads move issue dropdown async Closes #16563 --- app/controllers/autocomplete_controller.rb | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'app/controllers/autocomplete_controller.rb') diff --git a/app/controllers/autocomplete_controller.rb b/app/controllers/autocomplete_controller.rb index eb0abc80ab4..155c78bcd8a 100644 --- a/app/controllers/autocomplete_controller.rb +++ b/app/controllers/autocomplete_controller.rb @@ -31,6 +31,21 @@ class AutocompleteController < ApplicationController render json: @user, only: [:name, :username, :id], methods: [:avatar_url] end + def projects + project = Project.find_by_id(params[:project_id]) + + projects = current_user.authorized_projects + projects = projects.select do |project| + current_user.can?(:admin_issue, project) + end + + no_project = OpenStruct.new(id: 0, name_with_namespace: 'No project') + projects.unshift(no_project.marshal_dump) + projects.delete(project) + + render json: projects.to_json(only: [:id, :name_with_namespace], methods: :name_with_namespace) + end + private def find_users -- cgit v1.2.1 From 672bd4e6ff52da0acad0a5838324ba0039ed484c Mon Sep 17 00:00:00 2001 From: Phil Hughes Date: Fri, 20 May 2016 21:52:45 +0100 Subject: Correctly sends project ID --- app/controllers/autocomplete_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/controllers/autocomplete_controller.rb') diff --git a/app/controllers/autocomplete_controller.rb b/app/controllers/autocomplete_controller.rb index 155c78bcd8a..61e92c1a805 100644 --- a/app/controllers/autocomplete_controller.rb +++ b/app/controllers/autocomplete_controller.rb @@ -40,7 +40,7 @@ class AutocompleteController < ApplicationController end no_project = OpenStruct.new(id: 0, name_with_namespace: 'No project') - projects.unshift(no_project.marshal_dump) + projects.unshift(no_project.to_h) projects.delete(project) render json: projects.to_json(only: [:id, :name_with_namespace], methods: :name_with_namespace) -- cgit v1.2.1 From 50a16c4bd75307f05bcffa4d1231872a1346ae6e Mon Sep 17 00:00:00 2001 From: Phil Hughes Date: Wed, 25 May 2016 15:26:02 +0100 Subject: Updated Ruby --- app/controllers/autocomplete_controller.rb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'app/controllers/autocomplete_controller.rb') diff --git a/app/controllers/autocomplete_controller.rb b/app/controllers/autocomplete_controller.rb index 61e92c1a805..3865b2d61fd 100644 --- a/app/controllers/autocomplete_controller.rb +++ b/app/controllers/autocomplete_controller.rb @@ -39,8 +39,11 @@ class AutocompleteController < ApplicationController current_user.can?(:admin_issue, project) end - no_project = OpenStruct.new(id: 0, name_with_namespace: 'No project') - projects.unshift(no_project.to_h) + no_project = { + id: 0, + name_with_namespace: 'No project', + } + projects.unshift(no_project) projects.delete(project) render json: projects.to_json(only: [:id, :name_with_namespace], methods: :name_with_namespace) -- cgit v1.2.1