Make the ref-selector function work properly for branch selection.
This commit is contained in:
parent
41d598ce50
commit
f4eda673c5
|
@ -65,7 +65,8 @@
|
||||||
url: $dropdown.data('refs-url'),
|
url: $dropdown.data('refs-url'),
|
||||||
data: {
|
data: {
|
||||||
ref: $dropdown.data('ref')
|
ref: $dropdown.data('ref')
|
||||||
}
|
},
|
||||||
|
dataType: "json"
|
||||||
}).done(function(refs) {
|
}).done(function(refs) {
|
||||||
return callback(refs);
|
return callback(refs);
|
||||||
});
|
});
|
||||||
|
@ -73,7 +74,7 @@
|
||||||
selectable: true,
|
selectable: true,
|
||||||
filterable: true,
|
filterable: true,
|
||||||
filterByText: true,
|
filterByText: true,
|
||||||
fieldName: 'ref',
|
fieldName: $dropdown.data('field-name'),
|
||||||
renderRow: function(ref) {
|
renderRow: function(ref) {
|
||||||
var link;
|
var link;
|
||||||
if (ref.header != null) {
|
if (ref.header != null) {
|
||||||
|
|
|
@ -17,13 +17,8 @@
|
||||||
.form-group.branch
|
.form-group.branch
|
||||||
= label_tag 'target_branch', target_label, class: 'control-label'
|
= label_tag 'target_branch', target_label, class: 'control-label'
|
||||||
.col-sm-10
|
.col-sm-10
|
||||||
.dropdown
|
= hidden_field_tag :target_branch, @project.default_branch, id: 'target_branch'
|
||||||
= dropdown_toggle @project.default_branch, { toggle: "dropdown", selected: @project.default_branch, ref: @ref, refs_url: branches_namespace_project_path(@project.namespace, @project) }, { toggle_class: "js-project-refs-dropdown js-target-branch" }
|
= dropdown_tag(@project.default_branch, options: { title: "Switch branch", filter: true, placeholder: "Search branches", toggle_class: 'js-project-refs-dropdown js-target-branch', dropdown_class: 'dropdown-menu-selectable', data: { field_name: "target_branch", selected: @project.default_branch, target_branch: @project.default_branch, refs_url: namespace_project_branches_path(@project.namespace, @project), submit_form_on_click: false }})
|
||||||
.dropdown-menu.dropdown-menu-selectable
|
|
||||||
= dropdown_title "Switch branch"
|
|
||||||
= dropdown_filter "Search branches"
|
|
||||||
= dropdown_content
|
|
||||||
= dropdown_loading
|
|
||||||
|
|
||||||
- if can?(current_user, :push_code, @project)
|
- if can?(current_user, :push_code, @project)
|
||||||
.js-create-merge-request-container
|
.js-create-merge-request-container
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
- @options && @options.each do |key, value|
|
- @options && @options.each do |key, value|
|
||||||
= hidden_field_tag key, value, id: nil
|
= hidden_field_tag key, value, id: nil
|
||||||
.dropdown
|
.dropdown
|
||||||
= dropdown_toggle dropdown_toggle_text, { toggle: "dropdown", selected: dropdown_toggle_text, ref: @ref, refs_url: refs_namespace_project_path(@project.namespace, @project) }, { toggle_class: "js-project-refs-dropdown" }
|
= dropdown_toggle dropdown_toggle_text, { toggle: "dropdown", selected: dropdown_toggle_text, ref: @ref, refs_url: refs_namespace_project_path(@project.namespace, @project), field_name: 'ref', submit_form_on_click: true }, { toggle_class: "js-project-refs-dropdown" }
|
||||||
.dropdown-menu.dropdown-menu-selectable{ class: ("dropdown-menu-align-right" if local_assigns[:align_right]) }
|
.dropdown-menu.dropdown-menu-selectable{ class: ("dropdown-menu-align-right" if local_assigns[:align_right]) }
|
||||||
= dropdown_title "Switch branch/tag"
|
= dropdown_title "Switch branch/tag"
|
||||||
= dropdown_filter "Search branches and tags"
|
= dropdown_filter "Search branches and tags"
|
||||||
|
|
Loading…
Reference in New Issue