Skip to content

Commit 0c54435

Browse files
committed
usermenu: Show favorite personal account projects
1 parent 4dea4fe commit 0c54435

File tree

3 files changed

+21
-36
lines changed

3 files changed

+21
-36
lines changed

app/assets/stylesheets/less/_usermenu.less

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@
8080
margin: 10px 0;
8181
padding: 0;
8282
list-style-type: none;
83+
8384
.favored {
8485
border-bottom: 1px dashed #7b1fa2;
8586
}
@@ -90,11 +91,17 @@
9091
border-left: 1px solid #fff;
9192
border-top: 1px solid #fff;
9293
border-right: 1px solid #fff;
94+
cursor: pointer;
95+
9396
&:hover {
9497
color: #3592B5;
9598
border: 1px solid #3592B5 !important;
9699
}
97-
cursor: pointer;
100+
101+
}
102+
103+
.etc-favorites {
104+
border-top: 1px dashed #7b1fa2;
98105
}
99106

100107
.user-search-form{

app/views/index/myOrganizationList.scala.html

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,23 +12,23 @@
1212
<div id="@title" class="no-result tab-pane user-ul @if(isActive) {active}">@Messages("title.no.results")</div>
1313
} else {
1414
<ul class="tab-pane user-ul @if(isActive) {active}" id="@title">
15-
@defining(UserApp.currentUser().ownProjects){ ownProjects =>
15+
@defining(currentUser.ownProjects){ ownProjects =>
1616
<li class="org-li">
1717
<div class="org-list project-flex-container all-orgs">
1818
<div class="project-item project-item-container">
1919
<div class="flex-item site-logo">
2020
<i class="project-avatar"></i>
2121
</div>
2222
<div class="projectName-owner all-org-names flex-item">
23-
<div class="project-name org-name flex-item">@UserApp.currentUser().loginId</div>
23+
<div class="project-name org-name flex-item">@currentUser.loginId</div>
2424
<div class="project-owner flex-item sub-project-counter"></div>
2525
</div>
2626
</div>
2727
<div class="star-org flex-item"></div>
2828
</div>
2929
<ul class="project-ul">
3030
@for(project <- ownProjects){
31-
@allProjectList_partial(project, FavoriteProject.findByProjectId(UserApp.currentUser().id, project.id) != null)
31+
@allProjectList_partial(project, FavoriteProject.findByProjectId(currentUser.id, project.id) != null)
3232
}
3333
</ul>
3434
</li>
@@ -46,6 +46,15 @@
4646
}
4747
}
4848
</ul>
49+
@defining(currentUser.favoriteProjects){ favoriteProjects =>
50+
<ul class="etc-favorites user-ul">
51+
@for(favoriteProject <- favoriteProjects){
52+
@if(!favoriteProject.project.hasGroup && !favoriteProject.owner.equals(currentUser.loginId)) {
53+
@myProjectList_partial(favoriteProject.project, true)
54+
}
55+
}
56+
</ul>
57+
}
4958
}
5059
}
5160

@@ -55,5 +64,5 @@
5564
<input class="search-input org-search" type="text" autocomplete="off" placeholder="@Messages("title.type.name")">
5665
<span class="bar"></span>
5766
</div>
58-
@displayOrganizations("organizations", Organization.findAllOrganizations(UserApp.currentUser.loginId), currentUser.getFavoriteOrganizations)
67+
@displayOrganizations("organizations", Organization.findAllOrganizations(currentUser.loginId), currentUser.getFavoriteOrganizations)
5968
</div>

app/views/index/myOwnProjectList_partial.scala.html

Lines changed: 0 additions & 31 deletions
This file was deleted.

0 commit comments

Comments
 (0)