Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
70028d36
Commit
70028d36
authored
Feb 22, 2016
by
Rubén Dávila
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Recator Issues Tab into a custom partial.
parent
a056dfa9
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
14 additions
and
24 deletions
+14
-24
app/views/groups/milestones/show.html.haml
app/views/groups/milestones/show.html.haml
+2
-13
app/views/projects/milestones/show.html.haml
app/views/projects/milestones/show.html.haml
+1
-8
app/views/shared/milestones/_issue.html.haml
app/views/shared/milestones/_issue.html.haml
+3
-2
app/views/shared/milestones/_issues.html.haml
app/views/shared/milestones/_issues.html.haml
+1
-1
app/views/shared/milestones/_issues_tab.html.haml
app/views/shared/milestones/_issues_tab.html.haml
+7
-0
No files found.
app/views/groups/milestones/show.html.haml
View file @
70028d36
...
@@ -68,20 +68,9 @@
...
@@ -68,20 +68,9 @@
Participants
Participants
%span
.badge
=
@milestone
.
participants
.
count
%span
.badge
=
@milestone
.
participants
.
count
.tab-content
.tab-content
.milestone-content
.tab-pane.active
#tab-issues
.tab-pane.active
#tab-issues
.gray-content-block.middle-block
=
render
'shared/milestones/issues_tab'
,
unassigned:
@milestone
.
opened_issues
.
unassigned
,
assigned:
@milestone
.
opened_issues
.
assigned
,
closed:
@milestone
.
closed_issues
.pull-right
=
link_to
'Browse Issues'
,
issues_group_path
(
@group
,
milestone_title:
@milestone
.
title
),
class:
"btn btn-grouped"
.oneline
All issues in this milestone
.row.prepend-top-default
.col-md-6
=
render
'issues'
,
title:
"Open"
,
issues:
@milestone
.
opened_issues
.col-md-6
=
render
'issues'
,
title:
"Closed"
,
issues:
@milestone
.
closed_issues
.tab-pane
#tab-merge-requests
.tab-pane
#tab-merge-requests
.gray-content-block.middle-block
.gray-content-block.middle-block
...
...
app/views/projects/milestones/show.html.haml
View file @
70028d36
...
@@ -94,14 +94,7 @@
...
@@ -94,14 +94,7 @@
.tab-content.milestone-content
.tab-content.milestone-content
.tab-pane.active
#tab-issues
.tab-pane.active
#tab-issues
.row.prepend-top-default
=
render
'shared/milestones/issues_tab'
,
unassigned:
@issues
.
opened
.
unassigned
,
assigned:
@issues
.
opened
.
assigned
,
closed:
@issues
.
closed
.col-md-4
=
render
(
'issues'
,
title:
'Unstarted Issues (open and unassigned)'
,
issues:
@issues
.
opened
.
unassigned
,
id:
'unassigned'
)
.col-md-4
=
render
(
'issues'
,
title:
'Ongoing Issues (open and assigned)'
,
issues:
@issues
.
opened
.
assigned
,
id:
'ongoing'
)
.col-md-4
=
render
(
'issues'
,
title:
'Completed Issues (closed)'
,
issues:
@issues
.
closed
,
id:
'closed'
)
.tab-pane
#tab-merge-requests
.tab-pane
#tab-merge-requests
.row.prepend-top-default
.row.prepend-top-default
.col-md-3
.col-md-3
...
...
app/views/
projects
/milestones/_issue.html.haml
→
app/views/
shared
/milestones/_issue.html.haml
View file @
70028d36
-
project
=
issue
.
project
%li
{
id:
dom_id
(
issue
,
'sortable'
),
class:
'issue-row'
,
'data-iid'
=>
issue
.
iid
,
'data-url'
=>
issue_path
(
issue
)
}
%li
{
id:
dom_id
(
issue
,
'sortable'
),
class:
'issue-row'
,
'data-iid'
=>
issue
.
iid
,
'data-url'
=>
issue_path
(
issue
)
}
%span
%span
=
link_to_gfm
issue
.
title
,
[
@project
.
namespace
.
becomes
(
Namespace
),
@
project
,
issue
],
title:
issue
.
title
=
link_to_gfm
issue
.
title
,
[
project
.
namespace
.
becomes
(
Namespace
),
project
,
issue
],
title:
issue
.
title
.issue-detail
.issue-detail
=
link_to
[
@project
.
namespace
.
becomes
(
Namespace
),
@
project
,
issue
]
do
=
link_to
[
project
.
namespace
.
becomes
(
Namespace
),
project
,
issue
]
do
%span
.issue-number
##{issue.iid}
%span
.issue-number
##{issue.iid}
-
issue
.
labels
.
each
do
|
label
|
-
issue
.
labels
.
each
do
|
label
|
=
render_colored_label
(
label
)
=
render_colored_label
(
label
)
...
...
app/views/
projects
/milestones/_issues.html.haml
→
app/views/
shared
/milestones/_issues.html.haml
View file @
70028d36
...
@@ -4,4 +4,4 @@
...
@@ -4,4 +4,4 @@
.pull-right
=
issues
.
size
.pull-right
=
issues
.
size
%ul
{
class:
"well-list issues-sortable-list"
,
id:
"issues-list-#{id}"
,
"data-state"
=>
id
}
%ul
{
class:
"well-list issues-sortable-list"
,
id:
"issues-list-#{id}"
,
"data-state"
=>
id
}
-
issues
.
sort_by
(
&
:position
).
each
do
|
issue
|
-
issues
.
sort_by
(
&
:position
).
each
do
|
issue
|
=
render
'issue'
,
issue:
issue
=
render
'
shared/milestones/
issue'
,
issue:
issue
app/views/shared/milestones/_issues_tab.html.haml
0 → 100644
View file @
70028d36
.row.prepend-top-default
.col-md-4
=
render
(
'shared/milestones/issues'
,
title:
'Unstarted Issues (open and unassigned)'
,
issues:
unassigned
,
id:
'unassigned'
)
.col-md-4
=
render
(
'shared/milestones/issues'
,
title:
'Ongoing Issues (open and assigned)'
,
issues:
assigned
,
id:
'ongoing'
)
.col-md-4
=
render
(
'shared/milestones/issues'
,
title:
'Completed Issues (closed)'
,
issues:
closed
,
id:
'closed'
)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment