Display epics in backlog and sprints

stable
Xavier Julián 2016-08-08 16:22:52 +02:00 committed by David Barragán Merino
parent 1a42030e80
commit 93645cee8c
5 changed files with 21 additions and 11 deletions

View File

@ -21,7 +21,12 @@ module = angular.module('taigaEpics')
BelongToEpicsDirective = () -> BelongToEpicsDirective = () ->
link = (scope, el, attrs) ->
if !scope.epics.isIterable
scope.epics = Immutable.fromJS(scope.epics)
return { return {
link: link,
templateUrl:"components/belong-to-epics/belong-to-epics.html", templateUrl:"components/belong-to-epics/belong-to-epics.html",
scope: { scope: {
epics: '=' epics: '='

View File

@ -1,23 +1,23 @@
div.row.us-item-row( .row.us-item-row(
ng-repeat="us in userstories track by us.id" ng-repeat="us in userstories track by us.id"
tg-bind-scope tg-bind-scope
ng-class="{blocked: us.is_blocked}" ng-class="{blocked: us.is_blocked}"
tg-class-permission="{'readonly': '!modify_us'}" tg-class-permission="{'readonly': '!modify_us'}"
) )
div.input(tg-check-permission="modify_us") .input(tg-check-permission="modify_us")
input( input(
type="checkbox" type="checkbox"
name="" name=""
) )
div.votes( .votes(
ng-class="{'inactive': !us.total_voters, 'is-voted': us.is_voter}" ng-class="{'inactive': !us.total_voters, 'is-voted': us.is_voter}"
title="{{ 'COMMON.VOTE_BUTTON.COUNTER_TITLE'|translate:{total:us.total_voters||0}:'messageformat' }}" title="{{ 'COMMON.VOTE_BUTTON.COUNTER_TITLE'|translate:{total:us.total_voters||0}:'messageformat' }}"
) )
tg-svg(svg-icon="icon-upvote") tg-svg(svg-icon="icon-upvote")
span {{ ::us.total_voters }} span {{ ::us.total_voters }}
div.user-stories .user-stories
div.tags-block(tg-colorize-tags="us.tags", tg-colorize-tags-type="backlog") .tags-block(tg-colorize-tags="us.tags", tg-colorize-tags-type="backlog")
div.user-story-name .user-story-name
a.clickable( a.clickable(
href="" href=""
tg-nav="project-userstories-detail:project=project.slug,ref=us.ref" tg-nav="project-userstories-detail:project=project.slug,ref=us.ref"
@ -26,7 +26,11 @@ div.row.us-item-row(
) )
span(tg-bo-ref="us.ref") span(tg-bo-ref="us.ref")
span(ng-bind="us.subject") span(ng-bind="us.subject")
div.us-settings tg-belong-to-epics(
ng-if="us.epics"
epics="us.epics"
)
.us-settings
a.e2e-edit.edit-story( a.e2e-edit.edit-story(
href="" href=""
tg-check-permission="modify_us" tg-check-permission="modify_us"

View File

@ -19,6 +19,10 @@ div.sprint-table(tg-bind-scope, ng-class="{'sprint-empty-wrapper': !sprint.user_
ng-class="{closed: us.is_closed, blocked: us.is_blocked}") ng-class="{closed: us.is_closed, blocked: us.is_blocked}")
span(tg-bo-ref="us.ref") span(tg-bo-ref="us.ref")
span(tg-bo-bind="us.subject") span(tg-bo-bind="us.subject")
tg-belong-to-epics(
ng-if="us.epics"
epics="us.epics"
)
div.column-points.width-1(tg-bo-bind="us.total_points", div.column-points.width-1(tg-bo-bind="us.total_points",
ng-class="{closed: us.is_closed, blocked: us.is_blocked}") ng-class="{closed: us.is_closed, blocked: us.is_blocked}")

View File

@ -28,7 +28,7 @@
flex-shrink: 0; flex-shrink: 0;
} }
.user-stories { .user-stories {
overflow: hidden; // overflow: hidden;
width: 100%; width: 100%;
} }
.status { .status {

View File

@ -47,14 +47,12 @@
a { a {
@include font-size(normal); @include font-size(normal);
@include font-type(text); @include font-type(text);
@include ellipsis($width: 90%);
display: inline-block; display: inline-block;
margin-right: .5rem; margin-right: .5rem;
} }
} }
.sprint { .sprint {
margin-bottom: 2rem; margin-bottom: 2rem;
overflow: hidden;
header { header {
position: relative; position: relative;
} }
@ -182,7 +180,6 @@
padding: 0 4px; padding: 0 4px;
} }
.us-name { .us-name {
@include ellipsis(230px);
display: block; display: block;
&.closed { &.closed {
color: lighten($gray-light, 5%); color: lighten($gray-light, 5%);