Download as
Browse Code »

Commit d3d0775acde8dbbb887665c3c52009d76e906d10

Authored by Dmitriy Zaporozhets
1 parent 04e8b518
Exists in spb-stable and in 2 other branches 7-0-stable, 7-0-stable-spb

Exclude info rows from milestone sorting items 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing 3 changed files with 4 additions and 2 deletions   Show diff stats
app/assets/javascripts/milestone.js.coffee
  Diff comments   View file @d3d0775
@@ -55,6 +55,7 @@ class Milestone @@ -55,6 +55,7 @@ class Milestone
55 $("#issues-list-unassigned, #issues-list-ongoing, #issues-list-closed").sortable( 55 $("#issues-list-unassigned, #issues-list-ongoing, #issues-list-closed").sortable(
56 connectWith: ".issues-sortable-list", 56 connectWith: ".issues-sortable-list",
57 dropOnEmpty: true, 57 dropOnEmpty: true,
  58 + items: "li:not(.ui-sort-disabled)",
58 update: (event, ui) -> 59 update: (event, ui) ->
59 data = $(this).sortable("serialize") 60 data = $(this).sortable("serialize")
60 Milestone.sortIssues(data) 61 Milestone.sortIssues(data)
@@ -83,6 +84,7 @@ class Milestone @@ -83,6 +84,7 @@ class Milestone
83 $("#merge_requests-list-unassigned, #merge_requests-list-ongoing, #merge_requests-list-closed").sortable( 84 $("#merge_requests-list-unassigned, #merge_requests-list-ongoing, #merge_requests-list-closed").sortable(
84 connectWith: ".merge_requests-sortable-list", 85 connectWith: ".merge_requests-sortable-list",
85 dropOnEmpty: true, 86 dropOnEmpty: true,
  87 + items: "li:not(.ui-sort-disabled)",
86 update: (event, ui) -> 88 update: (event, ui) ->
87 data = $(this).sortable("serialize") 89 data = $(this).sortable("serialize")
88 Milestone.sortMergeRequests(data) 90 Milestone.sortMergeRequests(data)
app/views/projects/milestones/_issues.html.haml
  Diff comments   View file @d3d0775
@@ -3,4 +3,4 @@ @@ -3,4 +3,4 @@
3 %ul{ class: "well-list issues-sortable-list", id: "issues-list-#{id}", "data-state" => id } 3 %ul{ class: "well-list issues-sortable-list", id: "issues-list-#{id}", "data-state" => id }
4 - issues.sort_by(&:position).each do |issue| 4 - issues.sort_by(&:position).each do |issue|
5 = render 'issue', issue: issue 5 = render 'issue', issue: issue
6 - %li.light Drag and drop available 6 + %li.light.ui-sort-disabled Drag and drop available
app/views/projects/milestones/_merge_requests.html.haml
  Diff comments   View file @d3d0775
@@ -3,4 +3,4 @@ @@ -3,4 +3,4 @@
3 %ul{ class: "well-list merge_requests-sortable-list", id: "merge_requests-list-#{id}", "data-state" => id } 3 %ul{ class: "well-list merge_requests-sortable-list", id: "merge_requests-list-#{id}", "data-state" => id }
4 - merge_requests.sort_by(&:position).each do |merge_request| 4 - merge_requests.sort_by(&:position).each do |merge_request|
5 = render 'merge_request', merge_request: merge_request 5 = render 'merge_request', merge_request: merge_request
6 - %li.light Drag and drop available 6 + %li.light.ui-sort-disabled Drag and drop available