diff options
| author | Connor Shea <connor.james.shea@gmail.com> | 2016-08-01 16:07:08 -0600 |
|---|---|---|
| committer | Connor Shea <connor.james.shea@gmail.com> | 2016-08-17 09:23:43 -0600 |
| commit | f4eda673c5d7f98919e74a4542e13ac1bcfdd76d (patch) | |
| tree | b92405cf2e249682a80fc98fc9edc763c77907c6 | |
| parent | 41d598ce5004d23c6af7961284cfd9055297ba09 (diff) | |
| download | gitlab-ce-f4eda673c5d7f98919e74a4542e13ac1bcfdd76d.tar.gz | |
Make the ref-selector function work properly for branch selection.
| -rw-r--r-- | app/assets/javascripts/project.js | 5 | ||||
| -rw-r--r-- | app/views/projects/commit/_change.html.haml | 9 | ||||
| -rw-r--r-- | app/views/shared/_ref_switcher.html.haml | 2 |
3 files changed, 6 insertions, 10 deletions
diff --git a/app/assets/javascripts/project.js b/app/assets/javascripts/project.js index b97f6d22715..4e1de4dfb72 100644 --- a/app/assets/javascripts/project.js +++ b/app/assets/javascripts/project.js @@ -65,7 +65,8 @@ url: $dropdown.data('refs-url'), data: { ref: $dropdown.data('ref') - } + }, + dataType: "json" }).done(function(refs) { return callback(refs); }); @@ -73,7 +74,7 @@ selectable: true, filterable: true, filterByText: true, - fieldName: 'ref', + fieldName: $dropdown.data('field-name'), renderRow: function(ref) { var link; if (ref.header != null) { diff --git a/app/views/projects/commit/_change.html.haml b/app/views/projects/commit/_change.html.haml index f5407bdbc7b..6faf8267d4e 100644 --- a/app/views/projects/commit/_change.html.haml +++ b/app/views/projects/commit/_change.html.haml @@ -17,13 +17,8 @@ .form-group.branch = label_tag 'target_branch', target_label, class: 'control-label' .col-sm-10 - .dropdown - = 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-menu.dropdown-menu-selectable - = dropdown_title "Switch branch" - = dropdown_filter "Search branches" - = dropdown_content - = dropdown_loading + = hidden_field_tag :target_branch, @project.default_branch, id: '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 }}) - if can?(current_user, :push_code, @project) .js-create-merge-request-container diff --git a/app/views/shared/_ref_switcher.html.haml b/app/views/shared/_ref_switcher.html.haml index ea7162d4d63..9a8252ab087 100644 --- a/app/views/shared/_ref_switcher.html.haml +++ b/app/views/shared/_ref_switcher.html.haml @@ -6,7 +6,7 @@ - @options && @options.each do |key, value| = hidden_field_tag key, value, id: nil .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_title "Switch branch/tag" = dropdown_filter "Search branches and tags" |