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
Boxiang Sun
gitlab-ce
Commits
d7c5885c
Commit
d7c5885c
authored
Nov 27, 2012
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improved Issues and MR filters
parent
ade80e5c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
3 deletions
+21
-3
app/helpers/dashboard_helper.rb
app/helpers/dashboard_helper.rb
+19
-1
app/views/dashboard/_filter.html.haml
app/views/dashboard/_filter.html.haml
+2
-2
No files found.
app/helpers/dashboard_helper.rb
View file @
d7c5885c
module
DashboardHelper
def
dashboard_filter_path
(
entity
,
options
=
{})
exist_opts
=
{
status:
params
[
:status
],
project_id:
params
[
:project_id
],
}
options
=
exist_opts
.
merge
(
options
)
case
entity
when
'issue'
then
dashboard_issues_path
(
options
)
...
...
@@ -9,6 +16,17 @@ module DashboardHelper
end
def
entities_per_project
project
,
entity
project
.
items_for
(
entity
).
where
(
assignee_id:
current_user
.
id
).
count
items
=
project
.
items_for
(
entity
)
items
=
case
params
[
:status
]
when
'closed'
items
.
closed
when
'all'
items
else
items
.
opened
end
items
.
where
(
assignee_id:
current_user
.
id
).
count
end
end
app/views/dashboard/_filter.html.haml
View file @
d7c5885c
=
form_tag
dashboard_filter_path
(
entity
),
method:
'get'
do
%fieldset
.dashboard-search-filter
=
search_field_tag
"search"
,
nil
,
{
placeholder:
'Search'
,
class:
'search-text-input'
}
=
search_field_tag
"search"
,
params
[
:search
]
,
{
placeholder:
'Search'
,
class:
'search-text-input'
}
=
button_tag
type:
'submit'
,
class:
'btn'
do
%i
.icon-search
...
...
@@ -8,7 +8,7 @@
%legend
Status:
%ul
.nav.nav-pills.nav-stacked
%li
{
class:
(
"active"
if
!
params
[
:status
])}
=
link_to
dashboard_filter_path
(
entity
)
do
=
link_to
dashboard_filter_path
(
entity
,
status:
nil
)
do
Open
%li
{
class:
(
"active"
if
params
[
:status
]
==
'closed'
)}
=
link_to
dashboard_filter_path
(
entity
,
status:
'closed'
)
do
...
...
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