|
12 | 12 | <div id="@title" class="no-result tab-pane user-ul @if(isActive) {active}">@Messages("title.no.results")</div> |
13 | 13 | } else { |
14 | 14 | <ul class="tab-pane user-ul @if(isActive) {active}" id="@title"> |
15 | | - @defining(UserApp.currentUser().ownProjects){ ownProjects => |
| 15 | + @defining(currentUser.ownProjects){ ownProjects => |
16 | 16 | <li class="org-li"> |
17 | 17 | <div class="org-list project-flex-container all-orgs"> |
18 | 18 | <div class="project-item project-item-container"> |
19 | 19 | <div class="flex-item site-logo"> |
20 | 20 | <i class="project-avatar"></i> |
21 | 21 | </div> |
22 | 22 | <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> |
24 | 24 | <div class="project-owner flex-item sub-project-counter"></div> |
25 | 25 | </div> |
26 | 26 | </div> |
27 | 27 | <div class="star-org flex-item"></div> |
28 | 28 | </div> |
29 | 29 | <ul class="project-ul"> |
30 | 30 | @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) |
32 | 32 | } |
33 | 33 | </ul> |
34 | 34 | </li> |
|
46 | 46 | } |
47 | 47 | } |
48 | 48 | </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 | + } |
49 | 58 | } |
50 | 59 | } |
51 | 60 |
|
|
55 | 64 | <input class="search-input org-search" type="text" autocomplete="off" placeholder="@Messages("title.type.name")"> |
56 | 65 | <span class="bar"></span> |
57 | 66 | </div> |
58 | | - @displayOrganizations("organizations", Organization.findAllOrganizations(UserApp.currentUser.loginId), currentUser.getFavoriteOrganizations) |
| 67 | + @displayOrganizations("organizations", Organization.findAllOrganizations(currentUser.loginId), currentUser.getFavoriteOrganizations) |
59 | 68 | </div> |
0 commit comments