Skip to content
Snippets Groups Projects
Commit d54b8826 authored by Akram FARES's avatar Akram FARES Committed by Akram Fares
Browse files

Limit autocomplete to currently selected items

parent 3de1e71c
No related branches found
No related tags found
1 merge request!6796Limit autocomplete to currently selected items
Loading
Loading
@@ -51,6 +51,11 @@
if (!GitLab.GfmAutoComplete.dataLoaded) {
return this.at;
} else {
if (value.indexOf("unlabel") !== -1) {
GitLab.GfmAutoComplete.input.atwho('load', '~', GitLab.GfmAutoComplete.cachedData.unlabels);
} else {
GitLab.GfmAutoComplete.input.atwho('load', '~', GitLab.GfmAutoComplete.cachedData.labels);
}
return value;
}
}
Loading
Loading
@@ -352,3 +357,4 @@
};
 
}).call(this);
Loading
Loading
@@ -144,13 +144,15 @@ class ProjectsController < Projects::ApplicationController
 
autocomplete = ::Projects::AutocompleteService.new(@project, current_user)
participants = ::Projects::ParticipantsService.new(@project, current_user).execute(noteable)
unlabels = autocomplete.unlabels(noteable)
 
@suggestions = {
emojis: Gitlab::AwardEmoji.urls,
issues: autocomplete.issues,
milestones: autocomplete.milestones,
mergerequests: autocomplete.merge_requests,
labels: autocomplete.labels,
labels: autocomplete.labels - unlabels,
unlabels: unlabels,
members: participants,
commands: autocomplete.commands(noteable, params[:type])
}
Loading
Loading
Loading
Loading
@@ -13,7 +13,14 @@ module Projects
end
 
def labels
LabelsFinder.new(current_user, project_id: project.id).execute.select([:title, :color])
LabelsFinder.new(current_user, project_id: project.id).execute.
pluck(:title, :color).map { |l| { title: l.first, color: l.second } }
end
def unlabels(noteable)
return [] unless noteable && noteable.respond_to?(:labels)
noteable.labels.pluck(:title, :color).map { |l| { title: l.first, color: l.second } }
end
 
def commands(noteable, type)
Loading
Loading
---
title: Limit autocomplete to currently selected items for unlabel slash command
merge_request: 22680
author: Akram Fares
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment