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
iv
gitlab-ce
Commits
9bf85c01
Commit
9bf85c01
authored
Feb 05, 2016
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'paginate-dashboard-projects' into 'master'
Page project list on dashboard See merge request !2689
parents
0c449e36
f1102b33
Changes
15
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
91 additions
and
33 deletions
+91
-33
app/assets/javascripts/dashboard.js.coffee
app/assets/javascripts/dashboard.js.coffee
+30
-3
app/assets/javascripts/dispatcher.js.coffee
app/assets/javascripts/dispatcher.js.coffee
+1
-1
app/assets/javascripts/projects_list.js.coffee
app/assets/javascripts/projects_list.js.coffee
+0
-2
app/controllers/application_controller.rb
app/controllers/application_controller.rb
+2
-1
app/controllers/dashboard/projects_controller.rb
app/controllers/dashboard/projects_controller.rb
+24
-2
app/controllers/explore/projects_controller.rb
app/controllers/explore/projects_controller.rb
+6
-6
app/controllers/groups_controller.rb
app/controllers/groups_controller.rb
+1
-0
app/controllers/users_controller.rb
app/controllers/users_controller.rb
+2
-1
app/models/event.rb
app/models/event.rb
+1
-1
app/views/dashboard/_projects_head.html.haml
app/views/dashboard/_projects_head.html.haml
+2
-1
app/views/dashboard/projects/_projects.html.haml
app/views/dashboard/projects/_projects.html.haml
+3
-0
app/views/explore/projects/starred.html.haml
app/views/explore/projects/starred.html.haml
+2
-2
app/views/explore/projects/trending.html.haml
app/views/explore/projects/trending.html.haml
+1
-1
app/views/projects/show.atom.builder
app/views/projects/show.atom.builder
+1
-1
app/views/shared/projects/_list.html.haml
app/views/shared/projects/_list.html.haml
+15
-11
No files found.
app/assets/javascripts/dashboard.js.coffee
View file @
9bf85c01
class
@
Dashboard
constructor
:
->
new
ProjectsList
()
@
Dashboard
=
init
:
->
this
.
initSearch
()
initSearch
:
->
@
timer
=
null
$
(
"#project-filter-form-field"
).
on
(
'keyup'
,
->
clearTimeout
(
@
timer
)
@
timer
=
setTimeout
(
Dashboard
.
filterResults
,
500
)
)
filterResults
:
=>
$
(
'.projects-list-holder'
).
fadeTo
(
250
,
0.5
)
form
=
null
form
=
$
(
"#project-filter-form"
)
search
=
$
(
"#project-filter-form-field"
).
val
()
project_filter_url
=
form
.
attr
(
'action'
)
+
'?'
+
form
.
serialize
()
$
.
ajax
type
:
"GET"
url
:
form
.
attr
(
'action'
)
data
:
form
.
serialize
()
complete
:
->
$
(
'.projects-list-holder'
).
fadeTo
(
250
,
1
)
success
:
(
data
)
->
$
(
'div.projects-list-holder'
).
replaceWith
(
data
.
html
)
# Change url so if user reload a page - search results are saved
history
.
replaceState
{
page
:
project_filter_url
},
document
.
title
,
project_filter_url
dataType
:
"json"
app/assets/javascripts/dispatcher.js.coffee
View file @
9bf85c01
...
...
@@ -58,7 +58,7 @@ class Dispatcher
shortcut_handler
=
new
ShortcutsNavigation
()
MergeRequests
.
init
()
when
'dashboard:show'
,
'root:show'
new
Dashboard
()
Dashboard
.
init
()
when
'dashboard:activity'
new
Activities
()
when
'dashboard:projects:starred'
...
...
app/assets/javascripts/projects_list.js.coffee
View file @
9bf85c01
...
...
@@ -22,5 +22,3 @@ class @ProjectsList
else
$
(
this
).
show
()
uiBox
.
find
(
"ul.projects-list li.bottom"
).
hide
()
app/controllers/application_controller.rb
View file @
9bf85c01
...
...
@@ -277,9 +277,10 @@ class ApplicationController < ActionController::Base
}
end
def
view_to_html_string
(
partial
)
def
view_to_html_string
(
partial
,
locals
=
{}
)
render_to_string
(
partial
,
locals:
locals
,
layout:
false
,
formats:
[
:html
]
)
...
...
app/controllers/dashboard/projects_controller.rb
View file @
9bf85c01
...
...
@@ -5,6 +5,14 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController
@projects
=
current_user
.
authorized_projects
.
sorted_by_activity
.
non_archived
@projects
=
@projects
.
sort
(
@sort
=
params
[
:sort
])
@projects
=
@projects
.
includes
(
:namespace
)
terms
=
params
[
'filter_projects'
]
if
terms
.
present?
@projects
=
@projects
.
search
(
terms
)
end
@projects
=
@projects
.
page
(
params
[
:page
]).
per
(
PER_PAGE
)
@last_push
=
current_user
.
recent_push
respond_to
do
|
format
|
...
...
@@ -14,6 +22,11 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController
load_events
render
layout:
false
end
format
.
json
do
render
json:
{
html:
view_to_html_string
(
"dashboard/projects/_projects"
,
locals:
{
projects:
@projects
})
}
end
end
end
...
...
@@ -21,6 +34,14 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController
@projects
=
current_user
.
starred_projects
@projects
=
@projects
.
includes
(
:namespace
,
:forked_from_project
,
:tags
)
@projects
=
@projects
.
sort
(
@sort
=
params
[
:sort
])
terms
=
params
[
'filter_projects'
]
if
terms
.
present?
@projects
=
@projects
.
search
(
terms
)
end
@projects
=
@projects
.
page
(
params
[
:page
]).
per
(
PER_PAGE
)
@last_push
=
current_user
.
recent_push
@groups
=
[]
...
...
@@ -28,8 +49,9 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController
format
.
html
format
.
json
do
load_events
pager_json
(
"events/_events"
,
@events
.
count
)
render
json:
{
html:
view_to_html_string
(
"dashboard/projects/projects"
,
locals:
{
projects:
@projects
})
}
end
end
end
...
...
app/controllers/explore/projects_controller.rb
View file @
9bf85c01
...
...
@@ -11,14 +11,14 @@ class Explore::ProjectsController < Explore::ApplicationController
end
def
trending
@
trending_
projects
=
TrendingProjectsFinder
.
new
.
execute
(
current_user
)
@
trending_projects
=
@trending_
projects
.
non_archived
@
trending_projects
=
@trending_
projects
.
page
(
params
[
:page
]).
per
(
PER_PAGE
)
@projects
=
TrendingProjectsFinder
.
new
.
execute
(
current_user
)
@
projects
=
@
projects
.
non_archived
@
projects
=
@
projects
.
page
(
params
[
:page
]).
per
(
PER_PAGE
)
end
def
starred
@
starred_
projects
=
ProjectsFinder
.
new
.
execute
(
current_user
)
@
starred_projects
=
@starred_
projects
.
reorder
(
'star_count DESC'
)
@
starred_projects
=
@starred_
projects
.
page
(
params
[
:page
]).
per
(
PER_PAGE
)
@projects
=
ProjectsFinder
.
new
.
execute
(
current_user
)
@
projects
=
@
projects
.
reorder
(
'star_count DESC'
)
@
projects
=
@
projects
.
page
(
params
[
:page
]).
per
(
PER_PAGE
)
end
end
app/controllers/groups_controller.rb
View file @
9bf85c01
...
...
@@ -41,6 +41,7 @@ class GroupsController < Groups::ApplicationController
def
show
@last_push
=
current_user
.
recent_push
if
current_user
@projects
=
@projects
.
includes
(
:namespace
)
@projects
=
@projects
.
page
(
params
[
:page
]).
per
(
PER_PAGE
)
respond_to
do
|
format
|
format
.
html
...
...
app/controllers/users_controller.rb
View file @
9bf85c01
...
...
@@ -4,8 +4,9 @@ class UsersController < ApplicationController
def
show
@contributed_projects
=
contributed_projects
.
joined
(
@user
).
reject
(
&
:forked?
)
@projects
=
PersonalProjectsFinder
.
new
(
@user
).
execute
(
current_user
)
@projects
=
@projects
.
page
(
params
[
:page
]).
per
(
PER_PAGE
)
@groups
=
@user
.
groups
.
order_id_desc
...
...
app/models/event.rb
View file @
9bf85c01
...
...
@@ -49,7 +49,7 @@ class Event < ActiveRecord::Base
scope
:code_push
,
->
{
where
(
action:
PUSHED
)
}
scope
:in_projects
,
->
(
projects
)
do
where
(
project_id:
projects
.
select
(
:id
).
reorder
(
nil
)).
recent
where
(
project_id:
projects
.
map
(
&
:id
)).
recent
end
scope
:with_associations
,
->
{
includes
(
project: :namespace
)
}
...
...
app/views/dashboard/_projects_head.html.haml
View file @
9bf85c01
...
...
@@ -13,7 +13,8 @@
Explore Projects
.nav-controls
=
search_field_tag
:filter_projects
,
nil
,
placeholder:
'Filter by name...'
,
class:
'projects-list-filter form-control hidden-xs input-short'
,
spellcheck:
false
=
form_tag
request
.
original_url
,
method: :get
,
class:
'project-filter-form'
,
id:
'project-filter-form'
do
|
f
|
=
search_field_tag
:filter_projects
,
params
[
:filter_projects
],
placeholder:
'Filter by name...'
,
class:
'project-filter-form-field form-control input-short'
,
spellcheck:
false
,
id:
'project-filter-form-field'
=
render
'explore/projects/dropdown'
-
if
current_user
.
can_create_project?
=
link_to
new_project_path
,
class:
'btn btn-new'
do
...
...
app/views/dashboard/projects/_projects.html.haml
View file @
9bf85c01
.projects-list-holder
=
render
'shared/projects/list'
,
projects:
@projects
,
ci:
true
:javascript
Dashboard
.
init
()
app/views/explore/projects/starred.html.haml
View file @
9bf85c01
...
...
@@ -7,5 +7,5 @@
=
render
'explore/head'
=
render
'explore/projects/nav'
=
render
'projects'
,
projects:
@
starred_
projects
=
paginate
@
starred_projects
,
theme:
'gitlab'
=
render
'projects'
,
projects:
@projects
=
paginate
@
projects
,
theme:
'gitlab'
if
@projects
app/views/explore/projects/trending.html.haml
View file @
9bf85c01
...
...
@@ -7,4 +7,4 @@
=
render
'explore/head'
=
render
'explore/projects/nav'
=
render
'projects'
,
projects:
@
trending_
projects
=
render
'projects'
,
projects:
@projects
app/views/projects/show.atom.builder
View file @
9bf85c01
...
...
@@ -4,7 +4,7 @@ xml.feed "xmlns" => "http://www.w3.org/2005/Atom", "xmlns:media" => "http://sear
xml.link href: namespace_project_url(@project.namespace, @project, format: :atom, private_token: current_user.try(:private_token)), rel: "self", type: "application/atom+xml"
xml.link href: namespace_project_url(@project.namespace, @project), rel: "alternate", type: "text/html"
xml.id namespace_project_url(@project.namespace, @project)
xml.updated @events[0].updated_at.xmlschema if @events[0
?
xml.updated @events[0].updated_at.xmlschema if @events[0
]
@events.each do |event|
event_to_atom(xml, event)
...
...
app/views/shared/projects/_list.html.haml
View file @
9bf85c01
...
...
@@ -8,18 +8,22 @@
-
show_last_commit_as_description
=
false
unless
local_assigns
[
:show_last_commit_as_description
]
==
true
%ul
.projects-list
-
projects
.
each_with_index
do
|
project
,
i
|
-
css_class
=
(
i
>=
projects_limit
)
?
'hide'
:
nil
=
render
"shared/projects/project"
,
project:
project
,
skip_namespace:
skip_namespace
,
avatar:
avatar
,
stars:
stars
,
css_class:
css_class
,
ci:
ci
,
use_creator_avatar:
use_creator_avatar
,
forks:
forks
,
show_last_commit_as_description:
show_last_commit_as_description
-
if
projects
.
any?
-
projects
.
each_with_index
do
|
project
,
i
|
-
css_class
=
(
i
>=
projects_limit
)
?
'hide'
:
nil
=
render
"shared/projects/project"
,
project:
project
,
skip_namespace:
skip_namespace
,
avatar:
avatar
,
stars:
stars
,
css_class:
css_class
,
ci:
ci
,
use_creator_avatar:
use_creator_avatar
,
forks:
forks
,
show_last_commit_as_description:
show_last_commit_as_description
-
if
projects
.
size
>
projects_limit
%li
.bottom.center
.light
#{
projects_limit
}
of
#{
pluralize
(
projects
.
count
,
'project'
)
}
displayed.
=
link_to
'#'
,
class:
'js-expand'
do
Show all
-
if
projects
.
size
>
projects_limit
&&
projects
.
kind_of?
(
Array
)
%li
.bottom.center
.light
#{
projects_limit
}
of
#{
pluralize
(
projects
.
count
,
'project'
)
}
displayed.
=
link_to
'#'
,
class:
'js-expand'
do
Show all
=
paginate
projects
,
theme:
"gitlab"
if
!
projects
.
kind_of?
(
Array
)
-
else
%h3
No projects found
:javascript
new
ProjectsList
();
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