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
892f1257
Commit
892f1257
authored
Oct 15, 2018
by
Martin Wortschack
Committed by
Phil Hughes
Oct 15, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve "Personal projects pagination in Profile Overview tab is broken"
parent
4321d70d
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
72 additions
and
15 deletions
+72
-15
app/assets/javascripts/pages/users/user_overview_block.js
app/assets/javascripts/pages/users/user_overview_block.js
+10
-5
app/assets/javascripts/pages/users/user_tabs.js
app/assets/javascripts/pages/users/user_tabs.js
+23
-6
app/controllers/users_controller.rb
app/controllers/users_controller.rb
+3
-1
app/views/shared/projects/_list.html.haml
app/views/shared/projects/_list.html.haml
+2
-1
changelogs/unreleased/52564-personal-projects-pagination-in-profile-overview-tab-is-broken.yml
...projects-pagination-in-profile-overview-tab-is-broken.yml
+5
-0
spec/features/users/overview_spec.rb
spec/features/users/overview_spec.rb
+29
-2
No files found.
app/assets/javascripts/pages/users/user_overview_block.js
View file @
892f1257
import
axios
from
'
~/lib/utils/axios_utils
'
;
import
axios
from
'
~/lib/utils/axios_utils
'
;
const
DEFAULT_LIMIT
=
20
;
export
default
class
UserOverviewBlock
{
export
default
class
UserOverviewBlock
{
constructor
(
options
=
{})
{
constructor
(
options
=
{})
{
this
.
container
=
options
.
container
;
this
.
container
=
options
.
container
;
this
.
url
=
options
.
url
;
this
.
url
=
options
.
url
;
this
.
limit
=
options
.
limit
||
20
;
this
.
requestParams
=
{
limit
:
DEFAULT_LIMIT
,
...
options
.
requestParams
,
};
this
.
loadData
();
this
.
loadData
();
}
}
...
@@ -15,9 +20,7 @@ export default class UserOverviewBlock {
...
@@ -15,9 +20,7 @@ export default class UserOverviewBlock {
axios
axios
.
get
(
this
.
url
,
{
.
get
(
this
.
url
,
{
params
:
{
params
:
this
.
requestParams
,
limit
:
this
.
limit
,
},
})
})
.
then
(({
data
})
=>
this
.
render
(
data
))
.
then
(({
data
})
=>
this
.
render
(
data
))
.
catch
(()
=>
loadingEl
.
classList
.
add
(
'
hide
'
));
.
catch
(()
=>
loadingEl
.
classList
.
add
(
'
hide
'
));
...
@@ -34,7 +37,9 @@ export default class UserOverviewBlock {
...
@@ -34,7 +37,9 @@ export default class UserOverviewBlock {
if
(
count
&&
count
>
0
)
{
if
(
count
&&
count
>
0
)
{
document
.
querySelector
(
`
${
this
.
container
}
.js-view-all`
).
classList
.
remove
(
'
hide
'
);
document
.
querySelector
(
`
${
this
.
container
}
.js-view-all`
).
classList
.
remove
(
'
hide
'
);
}
else
{
}
else
{
document
.
querySelector
(
`
${
this
.
container
}
.nothing-here-block`
).
classList
.
add
(
'
text-left
'
,
'
p-0
'
);
document
.
querySelector
(
`
${
this
.
container
}
.nothing-here-block`
)
.
classList
.
add
(
'
text-left
'
,
'
p-0
'
);
}
}
loadingEl
.
classList
.
add
(
'
hide
'
);
loadingEl
.
classList
.
add
(
'
hide
'
);
...
...
app/assets/javascripts/pages/users/user_tabs.js
View file @
892f1257
...
@@ -182,18 +182,22 @@ export default class UserTabs {
...
@@ -182,18 +182,22 @@ export default class UserTabs {
this
.
loadActivityCalendar
(
'
overview
'
);
this
.
loadActivityCalendar
(
'
overview
'
);
UserTabs
.
renderMostRecentBlocks
(
'
#js-overview .activities-block
'
,
5
);
UserTabs
.
renderMostRecentBlocks
(
'
#js-overview .activities-block
'
,
{
UserTabs
.
renderMostRecentBlocks
(
'
#js-overview .projects-block
'
,
10
);
requestParams
:
{
limit
:
5
},
});
UserTabs
.
renderMostRecentBlocks
(
'
#js-overview .projects-block
'
,
{
requestParams
:
{
limit
:
10
,
skip_pagination
:
true
},
});
this
.
loaded
.
overview
=
true
;
this
.
loaded
.
overview
=
true
;
}
}
static
renderMostRecentBlocks
(
container
,
limit
)
{
static
renderMostRecentBlocks
(
container
,
options
)
{
// eslint-disable-next-line no-new
// eslint-disable-next-line no-new
new
UserOverviewBlock
({
new
UserOverviewBlock
({
container
,
container
,
url
:
$
(
`
${
container
}
.overview-content-list`
).
data
(
'
href
'
),
url
:
$
(
`
${
container
}
.overview-content-list`
).
data
(
'
href
'
),
limit
,
...
options
,
});
});
}
}
...
@@ -216,7 +220,12 @@ export default class UserTabs {
...
@@ -216,7 +220,12 @@ export default class UserTabs {
let
calendarHint
=
''
;
let
calendarHint
=
''
;
if
(
action
===
'
activity
'
)
{
if
(
action
===
'
activity
'
)
{
calendarHint
=
sprintf
(
__
(
'
Summary of issues, merge requests, push events, and comments (Timezone: %{utcFormatted})
'
),
{
utcFormatted
});
calendarHint
=
sprintf
(
__
(
'
Summary of issues, merge requests, push events, and comments (Timezone: %{utcFormatted})
'
,
),
{
utcFormatted
},
);
}
else
if
(
action
===
'
overview
'
)
{
}
else
if
(
action
===
'
overview
'
)
{
calendarHint
=
__
(
'
Issues, merge requests, pushes and comments.
'
);
calendarHint
=
__
(
'
Issues, merge requests, pushes and comments.
'
);
}
}
...
@@ -224,7 +233,15 @@ export default class UserTabs {
...
@@ -224,7 +233,15 @@ export default class UserTabs {
$calendarWrap
.
find
(
'
.calendar-hint
'
).
text
(
calendarHint
);
$calendarWrap
.
find
(
'
.calendar-hint
'
).
text
(
calendarHint
);
// eslint-disable-next-line no-new
// eslint-disable-next-line no-new
new
ActivityCalendar
(
'
.tab-pane.active .js-contrib-calendar
'
,
'
.tab-pane.active .user-calendar-activities
'
,
data
,
calendarActivitiesPath
,
utcOffset
,
0
,
monthsAgo
);
new
ActivityCalendar
(
'
.tab-pane.active .js-contrib-calendar
'
,
'
.tab-pane.active .user-calendar-activities
'
,
data
,
calendarActivitiesPath
,
utcOffset
,
0
,
monthsAgo
,
);
})
})
.
catch
(()
=>
flash
(
__
(
'
There was an error loading users activity calendar.
'
)));
.
catch
(()
=>
flash
(
__
(
'
There was an error loading users activity calendar.
'
)));
}
}
...
...
app/controllers/users_controller.rb
View file @
892f1257
...
@@ -56,10 +56,12 @@ class UsersController < ApplicationController
...
@@ -56,10 +56,12 @@ class UsersController < ApplicationController
def
projects
def
projects
load_projects
load_projects
skip_pagination
=
Gitlab
::
Utils
.
to_boolean
(
params
[
:skip_pagination
])
respond_to
do
|
format
|
respond_to
do
|
format
|
format
.
html
{
render
'show'
}
format
.
html
{
render
'show'
}
format
.
json
do
format
.
json
do
pager_json
(
"shared/projects/_list"
,
@projects
.
count
,
projects:
@projects
)
pager_json
(
"shared/projects/_list"
,
@projects
.
count
,
projects:
@projects
,
skip_pagination:
skip_pagination
)
end
end
end
end
end
end
...
...
app/views/shared/projects/_list.html.haml
View file @
892f1257
...
@@ -8,6 +8,7 @@
...
@@ -8,6 +8,7 @@
-
user
=
local_assigns
[
:user
]
-
user
=
local_assigns
[
:user
]
-
show_last_commit_as_description
=
false
unless
local_assigns
[
:show_last_commit_as_description
]
==
true
-
show_last_commit_as_description
=
false
unless
local_assigns
[
:show_last_commit_as_description
]
==
true
-
remote
=
false
unless
local_assigns
[
:remote
]
==
true
-
remote
=
false
unless
local_assigns
[
:remote
]
==
true
-
skip_pagination
=
false
unless
local_assigns
[
:skip_pagination
]
==
true
.js-projects-list-holder
.js-projects-list-holder
-
if
any_projects?
(
projects
)
-
if
any_projects?
(
projects
)
...
@@ -25,6 +26,6 @@
...
@@ -25,6 +26,6 @@
=
icon
(
'lock fw'
,
base:
'circle'
,
class:
'fa-lg private-fork-icon'
)
=
icon
(
'lock fw'
,
base:
'circle'
,
class:
'fa-lg private-fork-icon'
)
%strong
=
pluralize
(
@private_forks_count
,
'private fork'
)
%strong
=
pluralize
(
@private_forks_count
,
'private fork'
)
%span
you have no access to.
%span
you have no access to.
=
paginate_collection
(
projects
,
remote:
remote
)
=
paginate_collection
(
projects
,
remote:
remote
)
unless
skip_pagination
-
else
-
else
.nothing-here-block
No projects found
.nothing-here-block
No projects found
changelogs/unreleased/52564-personal-projects-pagination-in-profile-overview-tab-is-broken.yml
0 → 100644
View file @
892f1257
---
title
:
Hide pagination for personal projects on profile overview tab
merge_request
:
22321
author
:
type
:
other
spec/features/users/overview_spec.rb
View file @
892f1257
...
@@ -104,8 +104,9 @@ describe 'Overview tab on a user profile', :js do
...
@@ -104,8 +104,9 @@ describe 'Overview tab on a user profile', :js do
end
end
describe
'user has a personal project'
do
describe
'user has a personal project'
do
let
(
:private_project
)
{
create
(
:project
,
:private
,
namespace:
user
.
namespace
,
creator:
user
)
{
|
p
|
p
.
add_maintainer
(
user
)
}
}
before
do
let!
(
:private_event
)
{
create
(
:event
,
project:
private_project
,
author:
user
)
}
create
(
:project
,
:private
,
namespace:
user
.
namespace
,
creator:
user
)
{
|
p
|
p
.
add_maintainer
(
user
)
}
end
include_context
'visit overview tab'
include_context
'visit overview tab'
...
@@ -119,5 +120,31 @@ describe 'Overview tab on a user profile', :js do
...
@@ -119,5 +120,31 @@ describe 'Overview tab on a user profile', :js do
expect
(
find
(
'#js-overview .projects-block'
)).
to
have_selector
(
'.js-view-all'
,
visible:
true
)
expect
(
find
(
'#js-overview .projects-block'
)).
to
have_selector
(
'.js-view-all'
,
visible:
true
)
end
end
end
end
describe
'user has more than ten personal projects'
do
before
do
create_list
(
:project
,
11
,
:private
,
namespace:
user
.
namespace
,
creator:
user
)
do
|
project
|
project
.
add_maintainer
(
user
)
end
end
include_context
'visit overview tab'
it
'it shows max. ten entries in the list of projects'
do
page
.
within
(
'.projects-block'
)
do
expect
(
page
).
to
have_selector
(
'.project-row'
,
count:
10
)
end
end
it
'shows a link to the project list'
do
expect
(
find
(
'#js-overview .projects-block'
)).
to
have_selector
(
'.js-view-all'
,
visible:
true
)
end
it
'does not show pagination'
do
page
.
within
(
'.projects-block'
)
do
expect
(
page
).
not_to
have_selector
(
'.gl-pagination'
)
end
end
end
end
end
end
end
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