taiga
/
taiga-front
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixing bad commit

stable
Alejandro Alonso 2015-02-09 09:09:52 +01:00
parent d7c27aebd6
commit d68e2e25c8
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/coffee/modules/team/main.coffee
View File

@ -69,18 +69,18 @@ class TeamController extends mixOf(taiga.Controller, taiga.PageMixin)
loadMembers: ->
return @rs.memberships.list(@scope.projectId, {}, false).then (data) =>
currentUser = @auth.getUser()
if currentUser? and not currentUser.photo?
if not currentUser.photo?
currentUser.photo = "/images/unnamed.png"
@scope.currentUser = _.find data, (membership) =>
return currentUser? and membership.user == currentUser.id
return membership.user == currentUser.id
@scope.totals = {}
_.forEach data, (membership) =>
@scope.totals[membership.user] = 0
@scope.memberships = _.filter data, (membership) =>
if membership.user && (not currentUser? or membership.user != currentUser.id) && membership.is_user_active
if membership.user && membership.user != currentUser.id && membership.is_user_active
return membership
for membership in @scope.memberships

2
app/partials/project/project-menu.jade
View File

@ -44,7 +44,6 @@ div(class="menu-container")
span(class="icon icon-settings")
span(class="item") Admin
<% } %>
<% if (user) { %>
div(class="user")
div(class="user-settings")
ul(class="popover")
@ -62,4 +61,3 @@ div(class="menu-container")
a(href="" title="Logout" class="logout") Logout
a(href="" title="User preferences" class="avatar" id="nav-user-settings")
img(src!="<%- user.photo %>" alt!="<%- user.full_name_display %>")
<% } %>