diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/boards/stores/boards_store.js.es6 | 2 | ||||
| -rwxr-xr-x | app/assets/javascripts/boards/test_utils/simulate_drag.js | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/boards.scss | 1 | ||||
| -rw-r--r-- | app/helpers/issuables_helper.rb | 8 | ||||
| -rw-r--r-- | app/views/projects/boards/show.html.haml | 2 | ||||
| -rw-r--r-- | app/views/shared/issuable/_milestone_dropdown.html.haml | 6 |
6 files changed, 15 insertions, 6 deletions
diff --git a/app/assets/javascripts/boards/stores/boards_store.js.es6 b/app/assets/javascripts/boards/stores/boards_store.js.es6 index 0fe0935feb5..bb04ca8ccb5 100644 --- a/app/assets/javascripts/boards/stores/boards_store.js.es6 +++ b/app/assets/javascripts/boards/stores/boards_store.js.es6 @@ -7,7 +7,7 @@ this.state.filters = { author_id: gl.utils.getParameterValues('author_id')[0], assignee_id: gl.utils.getParameterValues('assignee_id')[0], - milestone_title: gl.utils.getParameterValues('milestone_title')[0], + milestone_title: gl.utils.getParameterValues('milestone_title')[0] || '#upcoming', label_name: gl.utils.getParameterValues('label_name[]') }; }, diff --git a/app/assets/javascripts/boards/test_utils/simulate_drag.js b/app/assets/javascripts/boards/test_utils/simulate_drag.js index 3db593f8333..8c5196e7719 100755 --- a/app/assets/javascripts/boards/test_utils/simulate_drag.js +++ b/app/assets/javascripts/boards/test_utils/simulate_drag.js @@ -88,7 +88,7 @@ var dragInterval = setInterval(function loop() { var progress = (new Date().getTime() - startTime) / duration; var x = (fromRect.cx + (toRect.cx - fromRect.cx) * progress) - scrollable.scrollLeft; - var y = (fromRect.cy + (toRect.cy - fromRect.cy) * progress) - scrollable.scrollTop; + var y = (fromRect.cy + (toRect.cy - fromRect.cy) * progress) - scrollable.scrollTop; var overEl = fromEl.ownerDocument.elementFromPoint(x, y); simulateEvent(overEl, 'mousemove', { diff --git a/app/assets/stylesheets/pages/boards.scss b/app/assets/stylesheets/pages/boards.scss index 6c33f09bc04..7a58b0578ea 100644 --- a/app/assets/stylesheets/pages/boards.scss +++ b/app/assets/stylesheets/pages/boards.scss @@ -228,6 +228,7 @@ .board-list { -webkit-flex: 1; flex: 1; + height: 400px; margin-bottom: 0; padding: 5px; overflow-y: scroll; diff --git a/app/helpers/issuables_helper.rb b/app/helpers/issuables_helper.rb index 47d174361db..7ebb8b77793 100644 --- a/app/helpers/issuables_helper.rb +++ b/app/helpers/issuables_helper.rb @@ -49,12 +49,16 @@ module IssuablesHelper end end - def milestone_dropdown_label(milestone_title, default_label = "Milestone") + def milestone_dropdown_label(milestone_title, is_boards, default_label = "Milestone") if milestone_title == Milestone::Upcoming.name milestone_title = Milestone::Upcoming.title end - h(milestone_title.presence || default_label) + if is_boards + boards_default = Milestone::Upcoming.title + end + + h(milestone_title.presence || boards_default || default_label) end def issuable_meta(issuable, project, text) diff --git a/app/views/projects/boards/show.html.haml b/app/views/projects/boards/show.html.haml index edbbd3f3d2a..2f428779751 100644 --- a/app/views/projects/boards/show.html.haml +++ b/app/views/projects/boards/show.html.haml @@ -4,7 +4,7 @@ - content_for :page_specific_javascripts do = page_specific_javascript_tag('boards/boards_bundle.js') - = page_specific_javascript_tag('boards/test_utils/simulate_drag.js') if Rails.env.test? + = page_specific_javascript_tag('boards/test_utils/simulate_drag.js') = render "projects/issues/head" diff --git a/app/views/shared/issuable/_milestone_dropdown.html.haml b/app/views/shared/issuable/_milestone_dropdown.html.haml index 2fcf40ece99..729e9b8a7c8 100644 --- a/app/views/shared/issuable/_milestone_dropdown.html.haml +++ b/app/views/shared/issuable/_milestone_dropdown.html.haml @@ -1,6 +1,10 @@ +- is_boards = controller.controller_name == 'boards' + - if params[:milestone_title].present? = hidden_field_tag(:milestone_title, params[:milestone_title]) -= dropdown_tag(milestone_dropdown_label(params[:milestone_title]), options: { title: "Filter by milestone", toggle_class: 'js-milestone-select js-filter-submit', filter: true, dropdown_class: "dropdown-menu-selectable", +- elsif is_boards + = hidden_field_tag(:milestone_title, Milestone::Upcoming.name) += dropdown_tag(milestone_dropdown_label(params[:milestone_title], is_boards), options: { title: "Filter by milestone", toggle_class: 'js-milestone-select js-filter-submit', filter: true, dropdown_class: "dropdown-menu-selectable", placeholder: "Search milestones", footer_content: @project.present?, data: { show_no: true, show_any: true, show_upcoming: true, field_name: "milestone_title", selected: params[:milestone_title], project_id: @project.try(:id), milestones: milestones_filter_dropdown_path, default_label: "Milestone" } }) do - if @project %ul.dropdown-footer-list |