From 0efc0f829e84c3d0d7a35a5d46fdf3f42859b1e1 Mon Sep 17 00:00:00 2001 From: Juanfran Date: Tue, 12 May 2015 14:28:59 +0200 Subject: [PATCH] fix tags --- app/modules/profile/profile-projects/profile-projects.jade | 2 +- .../profile-timeline-item-title.service.coffee | 2 +- app/modules/projects/listing/projects-listing.jade | 3 ++- app/modules/projects/projects.service.coffee | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/modules/profile/profile-projects/profile-projects.jade b/app/modules/profile/profile-projects/profile-projects.jade index 10774900..b5c015a9 100644 --- a/app/modules/profile/profile-projects/profile-projects.jade +++ b/app/modules/profile/profile-projects/profile-projects.jade @@ -7,7 +7,7 @@ section.profile-projects a(href="#", tg-nav="project:project=project.get('slug')", title="{{ ::project.get('name') }}") {{::project.get('name')}} p {{ ::project.get('description') | limitTo:300 }} - div.project-list-single-tags.tags-container + div.project-list-single-tags.tags-container(ng-if="::project.get('tags').size") span.tag(style='border-left: 5px solid {{::tag.get("color")}};', tg-repeat="tag in ::project.get('colorized_tags')") span.tag-name {{::tag.get('name')}} diff --git a/app/modules/profile/profile-timeline-item/profile-timeline-item-title.service.coffee b/app/modules/profile/profile-timeline-item/profile-timeline-item-title.service.coffee index be1ecdbb..b927fc1b 100644 --- a/app/modules/profile/profile-timeline-item/profile-timeline-item-title.service.coffee +++ b/app/modules/profile/profile-timeline-item/profile-timeline-item-title.service.coffee @@ -22,7 +22,7 @@ class ProfileTimelineItemTitle user = timeline.data.user title_attr = @translate.instant('COMMON.SEE_USER_PROFILE', {username: user.username}) url = 'user-profile:username=vm.activity.user.username' - console.log(user) + return @._getLink(url, user.name, title_attr) else if param == 'field_name' diff --git a/app/modules/projects/listing/projects-listing.jade b/app/modules/projects/listing/projects-listing.jade index 2dfaa4c7..68e58723 100644 --- a/app/modules/projects/listing/projects-listing.jade +++ b/app/modules/projects/listing/projects-listing.jade @@ -23,7 +23,8 @@ div.project-list-wrapper.centered span(ng-if="::project.get('description').length > 300") ... div.project-list-single-tags.tags-container(ng-if="::project.get('tags').size") - div.tags-block(tg-colorize-tags="project.get('tags')", tg-colorize-tags-type="backlog") + span.tag(style='border-left: 5px solid {{::tag.get("color")}};', tg-repeat="tag in ::project.get('colorized_tags')") + span.tag-name {{::tag.get('name')}} div.project-list-single-right span.drag.icon.icon-drag-v diff --git a/app/modules/projects/projects.service.coffee b/app/modules/projects/projects.service.coffee index ff1c4e40..a097ca9a 100644 --- a/app/modules/projects/projects.service.coffee +++ b/app/modules/projects/projects.service.coffee @@ -41,7 +41,7 @@ class ProjectsService extends taiga.Service colorized_tags = tags.map (tag) -> color = project.get("tags_colors").get(tag) - return {name: tag, color: color} + return Immutable.fromJS({name: tag, color: color}) project = project.set("colorized_tags", colorized_tags)