Fix Error 500 when viewing user's personal projects from admin page
This is a regression introduced in 4d7f00f
.
Closes #3680
This commit is contained in:
parent
dee28c50a9
commit
36bde0fcb1
3 changed files with 15 additions and 1 deletions
|
@ -1,6 +1,7 @@
|
||||||
Please view this file on the master branch, on stable branches it's out of date.
|
Please view this file on the master branch, on stable branches it's out of date.
|
||||||
|
|
||||||
v 8.3.0 (unreleased)
|
v 8.3.0 (unreleased)
|
||||||
|
- Fix Error 500 when viewing user's personal projects from admin page (Stan Hu)
|
||||||
- Fix: Assignee selector is empty when 'Unassigned' is selected (Jose Corcuera)
|
- Fix: Assignee selector is empty when 'Unassigned' is selected (Jose Corcuera)
|
||||||
- Fix 500 error when update group member permission
|
- Fix 500 error when update group member permission
|
||||||
|
|
||||||
|
|
13
app/views/admin/users/_projects.html.haml
Normal file
13
app/views/admin/users/_projects.html.haml
Normal file
|
@ -0,0 +1,13 @@
|
||||||
|
- if local_assigns.has_key?(:contributed_projects) && contributed_projects.present?
|
||||||
|
.panel.panel-default.contributed-projects
|
||||||
|
.panel-heading Projects contributed to
|
||||||
|
= render 'shared/projects/list',
|
||||||
|
projects: contributed_projects.sort_by(&:star_count).reverse,
|
||||||
|
projects_limit: 5, stars: true, avatar: false
|
||||||
|
|
||||||
|
- if local_assigns.has_key?(:projects) && projects.present?
|
||||||
|
.panel.panel-default
|
||||||
|
.panel-heading Personal projects
|
||||||
|
= render 'shared/projects/list',
|
||||||
|
projects: projects.sort_by(&:star_count).reverse,
|
||||||
|
projects_limit: 10, stars: true, avatar: false
|
|
@ -14,7 +14,7 @@
|
||||||
.row
|
.row
|
||||||
.col-md-6
|
.col-md-6
|
||||||
- if @personal_projects.present?
|
- if @personal_projects.present?
|
||||||
= render 'users/projects', projects: @personal_projects
|
= render 'admin/users/projects', projects: @personal_projects
|
||||||
- else
|
- else
|
||||||
.nothing-here-block This user has no personal projects.
|
.nothing-here-block This user has no personal projects.
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue