root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'mg-backport-create-item-dropdown-changes' into 'master' 

Update CreateItemDropdown class to allow the glDropdown filterRemote option

See merge request gitlab-org/gitlab-ce!21041
This commit is contained in:
Fatih Acet 2018-08-06 22:21:40 +00:00
parent ac1d83c56b a8c9cd41d2
commit dd627072b3
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/create_item_dropdown.js
View File

@ -12,6 +12,7 @@ export default class CreateItemDropdown {
this.fieldName = options.fieldName; this.fieldName = options.fieldName;
this.onSelect = options.onSelect || (() => {}); this.onSelect = options.onSelect || (() => {});
this.getDataOption = options.getData; this.getDataOption = options.getData;
this.getDataRemote = !!options.filterRemote;
this.createNewItemFromValueOption = options.createNewItemFromValue; this.createNewItemFromValueOption = options.createNewItemFromValue;
this.$dropdown = options.$dropdown; this.$dropdown = options.$dropdown;
this.$dropdownContainer = this.$dropdown.parent(); this.$dropdownContainer = this.$dropdown.parent();
@ -29,7 +30,7 @@ export default class CreateItemDropdown {
this.$dropdown.glDropdown({ this.$dropdown.glDropdown({
data: this.getData.bind(this), data: this.getData.bind(this),
filterable: true, filterable: true,
remote: false, filterRemote: this.getDataRemote,
search: { search: {
fields: ['text'], fields: ['text'],
}, },

3
app/assets/javascripts/environments/components/environment_item.vue
View File

@ -116,7 +116,8 @@ export default {
this.model && this.model &&
this.hasLastDeploymentKey && this.hasLastDeploymentKey &&
this.model.last_deployment && this.model.last_deployment &&
this.model.last_deployment.deployable this.model.last_deployment.deployable &&
this.model.last_deployment.deployable.retry_path
); );
}, },