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

Change user.full_name to user.full_name_display

stable
David Barragán Merino 2014-06-30 12:56:10 +02:00
parent fcfc0a648e
commit 5c206df05c
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/coffee/modules/controllerMixins.coffee
View File

@ -34,7 +34,7 @@ class PageMixin
return promise.then (results) => return promise.then (results) =>
[users, roles] = results [users, roles] = results
@scope.users = _.sortBy(users, "full_name") @scope.users = _.sortBy(users, "full_name_display")
@scope.usersById = groupBy(@scope.users, (e) -> e.id) @scope.usersById = groupBy(@scope.users, (e) -> e.id)
@scope.roles = _.sortBy(roles, "order") @scope.roles = _.sortBy(roles, "order")

2
app/coffee/modules/issues/list.coffee
View File

@ -258,7 +258,7 @@ IssueAssignedtoDirective = ->
$el.find("figcaption").html("Unassigned") $el.find("figcaption").html("Unassigned")
else else
bindOnce $scope, "membersById", (membersById) -> bindOnce $scope, "membersById", (membersById) ->
memberName = membersById[issue.assigned_to].full_name memberName = membersById[issue.assigned_to].full_name_display
$el.find("figcaption").html(memberName) $el.find("figcaption").html(memberName)
return { return {

4
app/partials/views/components/taskboard-task.jade
View File

@ -3,8 +3,8 @@ div.taskboard-tagline
div.taskboard-task-inner div.taskboard-task-inner
figure.avatar figure.avatar
a(href="", title="UserName") a(href="", title="UserName")
img.avatar(src="{{ usersById[task.assigned_to].avatar_url }}", alt="{{ usersById[task.assigned_to].full_name }}") img.avatar(src="{{ usersById[task.assigned_to].avatar_url }}", alt="{{ usersById[task.assigned_to].full_name_display }}")
figcaption {{ usersById[task.assigned_to].full_name }} figcaption {{ usersById[task.assigned_to].full_name_display }}
p.taskboard-text p.taskboard-text
span.task-num(ng-bind="task.ref") span.task-num(ng-bind="task.ref")
span.task-name(ng-bind="task.subject") span.task-name(ng-bind="task.subject")

2
app/partials/views/modules/lightbox_add-edit-task.jade
View File

@ -8,7 +8,7 @@ form
select(ng-model="task.status", ng-options="s.id as s.name for s in taskStatusList", select(ng-model="task.status", ng-options="s.id as s.name for s in taskStatusList",
placeholder="Task status") placeholder="Task status")
fieldset fieldset
select(ng-model="task.assigned_to", ng-options="s.id as s.full_name for s in users", select(ng-model="task.assigned_to", ng-options="s.id as s.full_name_display for s in users",
placeholder="Assigned to") placeholder="Assigned to")
option(value="") Unassigned option(value="") Unassigned
fieldset fieldset