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
Jérome Perrin
gitlab-ce
Commits
3b660be6
Commit
3b660be6
authored
Jul 12, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
REmove duplicating search on dashboard issues/mr
parent
7406494a
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
14 deletions
+10
-14
app/controllers/dashboard_controller.rb
app/controllers/dashboard_controller.rb
+0
-2
app/views/dashboard/_filter.html.haml
app/views/dashboard/_filter.html.haml
+0
-6
app/views/dashboard/issues.html.haml
app/views/dashboard/issues.html.haml
+5
-3
app/views/dashboard/merge_requests.html.haml
app/views/dashboard/merge_requests.html.haml
+5
-3
No files found.
app/controllers/dashboard_controller.rb
View file @
3b660be6
...
@@ -35,8 +35,6 @@ class DashboardController < ApplicationController
...
@@ -35,8 +35,6 @@ class DashboardController < ApplicationController
current_user
.
authorized_projects
current_user
.
authorized_projects
end
.
sorted_by_activity
end
.
sorted_by_activity
@projects
=
@projects
.
search
(
params
[
:search
])
if
params
[
:search
].
present?
@labels
=
current_user
.
authorized_projects
.
tags_on
(
:labels
)
@labels
=
current_user
.
authorized_projects
.
tags_on
(
:labels
)
@projects
=
@projects
.
tagged_with
(
params
[
:label
])
if
params
[
:label
].
present?
@projects
=
@projects
.
tagged_with
(
params
[
:label
])
if
params
[
:label
].
present?
...
...
app/views/dashboard/_filter.html.haml
View file @
3b660be6
=
form_tag
dashboard_filter_path
(
entity
),
method:
'get'
do
=
form_tag
dashboard_filter_path
(
entity
),
method:
'get'
do
%fieldset
.dashboard-search-filter
=
search_field_tag
"search"
,
params
[
:search
],
{
id:
'filter_search'
,
placeholder:
'Search'
,
class:
'search-text-input'
}
=
button_tag
type:
'submit'
,
class:
'btn'
do
%i
.icon-search
%fieldset
%fieldset
%legend
Status:
%ul
.nav.nav-pills.nav-stacked
%ul
.nav.nav-pills.nav-stacked
%li
{
class:
(
"active"
if
!
params
[
:status
])}
%li
{
class:
(
"active"
if
!
params
[
:status
])}
=
link_to
dashboard_filter_path
(
entity
,
status:
nil
)
do
=
link_to
dashboard_filter_path
(
entity
,
status:
nil
)
do
...
...
app/views/dashboard/issues.html.haml
View file @
3b660be6
%h3
.page_title
%h3
.page_title
Issues
Issues
%small
(assigned to you)
%span
.light
%small
.pull-right
#{
@issues
.
total_count
}
issues
–
Assigned to you
%span
.pull-right
#{
@issues
.
total_count
}
issues
%
h
r
%
b
r
.row
.row
.span3
.span3
...
...
app/views/dashboard/merge_requests.html.haml
View file @
3b660be6
%h3
.page_title
%h3
.page_title
Merge Requests
Merge Requests
%small
(authored by or assigned to you)
%span
.light
%small
.pull-right
#{
@merge_requests
.
total_count
}
merge requests
–
Authored by or assigned to you
%span
.pull-right
#{
@merge_requests
.
total_count
}
merge requests
%
h
r
%
b
r
.row
.row
.span3
.span3
=
render
'filter'
,
entity:
'merge_request'
=
render
'filter'
,
entity:
'merge_request'
...
...
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