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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
034ddb85
Commit
034ddb85
authored
Jun 18, 2012
by
randx
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Assignee filter for issues
parent
2dd17623
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
5 deletions
+9
-5
app/assets/stylesheets/gitlab_bootstrap.scss
app/assets/stylesheets/gitlab_bootstrap.scss
+1
-0
app/controllers/issues_controller.rb
app/controllers/issues_controller.rb
+1
-0
app/views/issues/_issues.html.haml
app/views/issues/_issues.html.haml
+1
-1
app/views/issues/index.html.haml
app/views/issues/index.html.haml
+6
-4
No files found.
app/assets/stylesheets/gitlab_bootstrap.scss
View file @
034ddb85
...
@@ -400,6 +400,7 @@ form {
...
@@ -400,6 +400,7 @@ form {
*
*
*/
*/
.ui-box
{
.ui-box
{
background
:
#F9F9F9
;
margin-bottom
:
40px
;
margin-bottom
:
40px
;
@include
round-borders-all
(
4px
);
@include
round-borders-all
(
4px
);
border-color
:
#CCC
;
border-color
:
#CCC
;
...
...
app/controllers/issues_controller.rb
View file @
034ddb85
...
@@ -137,6 +137,7 @@ class IssuesController < ApplicationController
...
@@ -137,6 +137,7 @@ class IssuesController < ApplicationController
else
@project
.
issues
.
opened
else
@project
.
issues
.
opened
end
end
@issues
=
@issues
.
where
(
:assignee_id
=>
params
[
:assignee_id
])
if
params
[
:assignee_id
].
present?
@issues
=
@issues
.
where
(
:milestone_id
=>
params
[
:milestone_id
])
if
params
[
:milestone_id
].
present?
@issues
=
@issues
.
where
(
:milestone_id
=>
params
[
:milestone_id
])
if
params
[
:milestone_id
].
present?
@issues
=
@issues
.
includes
(
:author
,
:project
).
order
(
"critical, updated_at"
)
@issues
=
@issues
.
includes
(
:author
,
:project
).
order
(
"critical, updated_at"
)
@issues
@issues
...
...
app/views/issues/_issues.html.haml
View file @
034ddb85
...
@@ -12,4 +12,4 @@
...
@@ -12,4 +12,4 @@
%span
.cgray.right
#{
@issues
.
total_count
}
issues for this filter
%span
.cgray.right
#{
@issues
.
total_count
}
issues for this filter
-
else
-
else
%li
%li
%
p
.padded
Nothing to show here
%
h4
.nothing_here_message
Nothing to show here
app/views/issues/index.html.haml
View file @
034ddb85
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
%div
#issues-table-holder
.ui-box
%div
#issues-table-holder
.ui-box
.title
.title
.row
.row
.span
6
.span
4
%ul
.nav.nav-pills.left
%ul
.nav.nav-pills.left
%li
{
:class
=>
(
"active"
if
(
params
[
:f
]
==
"0"
||
!
params
[
:f
]))}
%li
{
:class
=>
(
"active"
if
(
params
[
:f
]
==
"0"
||
!
params
[
:f
]))}
=
link_to
project_issues_path
(
@project
,
:f
=>
0
,
:milestone_id
=>
params
[
:milestone_id
])
do
=
link_to
project_issues_path
(
@project
,
:f
=>
0
,
:milestone_id
=>
params
[
:milestone_id
])
do
...
@@ -32,9 +32,10 @@
...
@@ -32,9 +32,10 @@
=
link_to
project_issues_path
(
@project
,
:f
=>
1
,
:milestone_id
=>
params
[
:milestone_id
])
do
=
link_to
project_issues_path
(
@project
,
:f
=>
1
,
:milestone_id
=>
params
[
:milestone_id
])
do
All
All
.span
4
.right
.span
6
.right
=
form_tag
project_issues_path
(
@project
),
:method
=>
:get
,
:class
=>
:right
do
=
form_tag
project_issues_path
(
@project
),
:method
=>
:get
,
:class
=>
:right
do
=
select_tag
(
:milestone_id
,
options_from_collection_for_select
(
@project
.
milestones
.
order
(
"id desc"
).
all
,
"id"
,
"title"
,
params
[
:milestone_id
]),
:prompt
=>
"Select milestone"
)
=
select_tag
(
:assignee_id
,
options_from_collection_for_select
(
@project
.
users
.
all
,
"id"
,
"name"
,
params
[
:assignee_id
]),
:prompt
=>
"Assignee"
)
=
select_tag
(
:milestone_id
,
options_from_collection_for_select
(
@project
.
milestones
.
order
(
"id desc"
).
all
,
"id"
,
"title"
,
params
[
:milestone_id
]),
:prompt
=>
"Milestone"
)
=
hidden_field_tag
:f
,
params
[
:f
]
=
hidden_field_tag
:f
,
params
[
:f
]
%ul
#issues-table
.unstyled
%ul
#issues-table
.unstyled
...
@@ -44,8 +45,9 @@
...
@@ -44,8 +45,9 @@
$
(
function
(){
$
(
function
(){
initIssuesSearch
();
initIssuesSearch
();
setSortable
();
setSortable
();
$
(
"
#assignee_id
"
).
chosen
();
$
(
"
#milestone_id
"
).
chosen
();
$
(
"
#milestone_id
"
).
chosen
();
$
(
"
#milestone_id
"
).
live
(
"
change
"
,
function
(){
$
(
"
#milestone_id
, #assignee_id
"
).
live
(
"
change
"
,
function
(){
$
(
this
).
closest
(
"
form
"
).
submit
();
$
(
this
).
closest
(
"
form
"
).
submit
();
});
});
})
})
...
...
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