Commit f1ec62f4 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Add reopened tab to milestone issues. Add ids and data to milestone issues to enable dragging

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent 47937802
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
margin-bottom: 10px; margin-bottom: 10px;
} }
@mixin str-truncated($max_width: "82%") { @mixin str-truncated($max_width: 82%) {
display: inline-block; display: inline-block;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
......
.issues-sortable-list .str-truncated {
max-width: 70%;
}
...@@ -87,6 +87,11 @@ class Projects::IssuesController < Projects::ApplicationController ...@@ -87,6 +87,11 @@ class Projects::IssuesController < Projects::ApplicationController
render :edit render :edit
end end
end end
format.json do
render json: {
saved: @issue.valid?,
}
end
end end
end end
......
%li{ 'data-iid' => issue.iid, 'data-url' => project_issue_path(@project, issue) }
%span.str-truncated
= link_to [@project, issue] do
%span.cgray ##{issue.iid}
= link_to_gfm issue.title, [@project, issue]
- if issue.assignee
.pull-right
= image_tag avatar_icon(issue.assignee.email, 16), class: "avatar s16"
.panel.panel-default .panel.panel-default
.panel-heading= title .panel-heading= title
%ul.well-list %ul{ class: "well-list issues-sortable-list", id: "issues-list-#{id}", "data-state" => id }
- issues.each do |issue| - issues.each do |issue|
%li = render 'issue', issue: issue
= link_to [@project, issue] do %li.light Drag and drop available
%span.label{class: issue.closed? ? 'label-danger' : 'label-info'} ##{issue.iid}
= link_to_gfm truncate(issue.title, length: 40), [@project, issue]
- if issue.assignee
.pull-right
= image_tag avatar_icon(issue.assignee.email, 16), class: "avatar s16"
...@@ -35,6 +35,12 @@ ...@@ -35,6 +35,12 @@
%h4.title %h4.title
= gfm escape_once(@milestone.title) = gfm escape_once(@milestone.title)
- if @milestone.description.present?
.description
.wiki
= preserve do
= markdown @milestone.description
.context .context
%p %p
Progress: Progress:
...@@ -45,11 +51,6 @@ ...@@ -45,11 +51,6 @@
.progress.progress-info .progress.progress-info
.progress-bar{style: "width: #{@milestone.percent_complete}%;"} .progress-bar{style: "width: #{@milestone.percent_complete}%;"}
- if @milestone.description.present?
.description
.wiki
= preserve do
= markdown @milestone.description
%ul.nav.nav-tabs %ul.nav.nav-tabs
%li.active %li.active
...@@ -74,12 +75,14 @@ ...@@ -74,12 +75,14 @@
.tab-content .tab-content
.tab-pane.active#tab-issues .tab-pane.active#tab-issues
.row .row
.col-md-4 .col-md-3
= render('issues', title: 'Unstarted Issues (open and unassigned)', issues: @issues.opened.unassigned) = render('issues', title: 'Unstarted Issues (open and unassigned)', issues: @issues.only_opened.unassigned, id: 'unassigned')
.col-md-4 .col-md-3
= render('issues', title: 'Ongoing Issues (open and assigned)', issues: @issues.opened.assigned) = render('issues', title: 'Ongoing Issues (open and assigned)', issues: @issues.only_opened.assigned, id: 'ongoing')
.col-md-4 .col-md-3
= render('issues', title: 'Completed Issues (closed)', issues: @issues.closed) = render('issues', title: 'Completed Issues (closed)', issues: @issues.closed, id: 'closed')
.col-md-3
= render('issues', title: 'Reopened Issues (reopened)', issues: @issues.only_reopened, id: 'reopened')
.tab-pane#tab-merge-requests .tab-pane#tab-merge-requests
.row .row
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment