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

Show the full name of users in the task or USs of the taskboard and kanban

stable
David Barragán Merino 2014-08-07 14:05:26 +02:00
parent 3ed3eaf99d
commit 1afe18e8d1
4 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/coffee/modules/kanban/main.coffee
View File

@ -283,9 +283,6 @@ KanbanUserDirective = ($log) ->
<figure class="avatar"> <figure class="avatar">
<a href="#" title="<%- name %>" <% if (!clickable) {%>class="not-clickable"<% } %>> <a href="#" title="<%- name %>" <% if (!clickable) {%>class="not-clickable"<% } %>>
<img src="<%= imgurl %>" alt="<%- name %>" class="avatar"> <img src="<%= imgurl %>" alt="<%- name %>" class="avatar">
<span class="assigned-to">
<span><%- name %></span>
</span>
</a> </a>
</figure> </figure>
""") """)
@ -312,6 +309,7 @@ KanbanUserDirective = ($log) ->
html = template(ctx) html = template(ctx)
$el.html(html) $el.html(html)
$el.parent().find("span.task-assigned").html(ctx.name)
bindOnce $scope, "project", (project) -> bindOnce $scope, "project", (project) ->
if project.my_permissions.indexOf("modify_us") > -1 if project.my_permissions.indexOf("modify_us") > -1

3
app/coffee/modules/taskboard/main.coffee
View File

@ -232,7 +232,6 @@ TaskboardUserDirective = ($log) ->
<figure class="avatar"> <figure class="avatar">
<a href="#" title="<%- name %>" <% if (!clickable) {%>class="not-clickable"<% } %>> <a href="#" title="<%- name %>" <% if (!clickable) {%>class="not-clickable"<% } %>>
<img src="<%= imgurl %>" alt="<%- name %>"> <img src="<%= imgurl %>" alt="<%- name %>">
<figcaption><%- name %></figcaption>
</a> </a>
</figure> </figure>
""") """)
@ -259,7 +258,7 @@ TaskboardUserDirective = ($log) ->
html = template(ctx) html = template(ctx)
$el.html(html) $el.html(html)
$el.parent().find("span.task-assigned").html(ctx.name)
bindOnce $scope, "project", (project) -> bindOnce $scope, "project", (project) ->
if project.my_permissions.indexOf("modify_task") > -1 if project.my_permissions.indexOf("modify_task") > -1

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

@ -1,9 +1,9 @@
div.kanban-tagline div.kanban-tagline
a.kanban-tag(ng-repeat="tag in us.tags", href="", tg-bo-title="tag", tg-colorize-tag-background="tag") a.kanban-tag(ng-repeat="tag in us.tags", href="", tg-bo-title="tag", tg-colorize-tag-background="tag")
div.kanban-task-inner div.kanban-task-inner
div(tg-kanban-user-avatar="us.assigned_to", ng-model="us") div(tg-kanban-user-avatar="us.assigned_to", ng-model="us", click="ctrl.editUsAssignedTo(task)")
div.task-text div.task-text
span.task-assigned Username span.task-assigned
span.task-num(tg-bo-ref="us.ref") span.task-num(tg-bo-ref="us.ref")
a.task-name(href="", title="", tg-bind-html="us.subject", a.task-name(href="", title="", tg-bind-html="us.subject",
tg-nav="project-userstories-detail:project=project.slug,ref=us.ref") tg-nav="project-userstories-detail:project=project.slug,ref=us.ref")

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

@ -3,7 +3,7 @@ div.taskboard-tagline
div.taskboard-task-inner div.taskboard-task-inner
div(tg-taskboard-user-avatar="task.assigned_to", ng-model="task", click="ctrl.editTaskAssignedTo(task)") div(tg-taskboard-user-avatar="task.assigned_to", ng-model="task", click="ctrl.editTaskAssignedTo(task)")
p.taskboard-text p.taskboard-text
span.task-assigned Username span.task-assigned
span.task-num(tg-bo-ref="task.ref") span.task-num(tg-bo-ref="task.ref")
a.task-name(href="", title="See task details", tg-bind-html="task.subject", a.task-name(href="", title="See task details", tg-bind-html="task.subject",
tg-nav="project-tasks-detail:project=project.slug,ref=task.ref") tg-nav="project-tasks-detail:project=project.slug,ref=task.ref")