diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-06-13 16:18:23 +0400 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-06-13 16:18:23 +0400 |
| commit | d3d0775acde8dbbb887665c3c52009d76e906d10 (patch) | |
| tree | 565f911402b0f1129e7af6c38dc94800080cc14b /app | |
| parent | 04e8b5184fe7a1af514314a8f1f9557d25ee8af0 (diff) | |
Exclude info rows from milestone sorting items
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/milestone.js.coffee | 2 | ||||
| -rw-r--r-- | app/views/projects/milestones/_issues.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/milestones/_merge_requests.html.haml | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/app/assets/javascripts/milestone.js.coffee b/app/assets/javascripts/milestone.js.coffee index 97a71b9d33f..5cbddd3a207 100644 --- a/app/assets/javascripts/milestone.js.coffee +++ b/app/assets/javascripts/milestone.js.coffee @@ -55,6 +55,7 @@ class Milestone $("#issues-list-unassigned, #issues-list-ongoing, #issues-list-closed").sortable( connectWith: ".issues-sortable-list", dropOnEmpty: true, + items: "li:not(.ui-sort-disabled)", update: (event, ui) -> data = $(this).sortable("serialize") Milestone.sortIssues(data) @@ -83,6 +84,7 @@ class Milestone $("#merge_requests-list-unassigned, #merge_requests-list-ongoing, #merge_requests-list-closed").sortable( connectWith: ".merge_requests-sortable-list", dropOnEmpty: true, + items: "li:not(.ui-sort-disabled)", update: (event, ui) -> data = $(this).sortable("serialize") Milestone.sortMergeRequests(data) diff --git a/app/views/projects/milestones/_issues.html.haml b/app/views/projects/milestones/_issues.html.haml index 95a4a9296cb..6e4df75a3df 100644 --- a/app/views/projects/milestones/_issues.html.haml +++ b/app/views/projects/milestones/_issues.html.haml @@ -3,4 +3,4 @@ %ul{ class: "well-list issues-sortable-list", id: "issues-list-#{id}", "data-state" => id } - issues.sort_by(&:position).each do |issue| = render 'issue', issue: issue - %li.light Drag and drop available + %li.light.ui-sort-disabled Drag and drop available diff --git a/app/views/projects/milestones/_merge_requests.html.haml b/app/views/projects/milestones/_merge_requests.html.haml index 521bfa7850e..00889a5eb24 100644 --- a/app/views/projects/milestones/_merge_requests.html.haml +++ b/app/views/projects/milestones/_merge_requests.html.haml @@ -3,4 +3,4 @@ %ul{ class: "well-list merge_requests-sortable-list", id: "merge_requests-list-#{id}", "data-state" => id } - merge_requests.sort_by(&:position).each do |merge_request| = render 'merge_request', merge_request: merge_request - %li.light Drag and drop available + %li.light.ui-sort-disabled Drag and drop available |