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

fix tags

stable
Juanfran 2015-05-12 14:28:59 +02:00
parent bdf9be9b46
commit 0efc0f829e
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/modules/profile/profile-projects/profile-projects.jade
View File

@ -7,7 +7,7 @@ section.profile-projects
a(href="#", tg-nav="project:project=project.get('slug')", title="{{ ::project.get('name') }}") {{::project.get('name')}} a(href="#", tg-nav="project:project=project.get('slug')", title="{{ ::project.get('name') }}") {{::project.get('name')}}
p {{ ::project.get('description') | limitTo:300 }} 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(style='border-left: 5px solid {{::tag.get("color")}};', tg-repeat="tag in ::project.get('colorized_tags')")
span.tag-name {{::tag.get('name')}} span.tag-name {{::tag.get('name')}}

2
app/modules/profile/profile-timeline-item/profile-timeline-item-title.service.coffee
View File

@ -22,7 +22,7 @@ class ProfileTimelineItemTitle
user = timeline.data.user user = timeline.data.user
title_attr = @translate.instant('COMMON.SEE_USER_PROFILE', {username: user.username}) title_attr = @translate.instant('COMMON.SEE_USER_PROFILE', {username: user.username})
url = 'user-profile:username=vm.activity.user.username' url = 'user-profile:username=vm.activity.user.username'
console.log(user)
return @._getLink(url, user.name, title_attr) return @._getLink(url, user.name, title_attr)
else if param == 'field_name' else if param == 'field_name'

3
app/modules/projects/listing/projects-listing.jade
View File

@ -23,7 +23,8 @@ div.project-list-wrapper.centered
span(ng-if="::project.get('description').length > 300") ... span(ng-if="::project.get('description').length > 300") ...
div.project-list-single-tags.tags-container(ng-if="::project.get('tags').size") 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 div.project-list-single-right
span.drag.icon.icon-drag-v span.drag.icon.icon-drag-v

2
app/modules/projects/projects.service.coffee
View File

@ -41,7 +41,7 @@ class ProjectsService extends taiga.Service
colorized_tags = tags.map (tag) -> colorized_tags = tags.map (tag) ->
color = project.get("tags_colors").get(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) project = project.set("colorized_tags", colorized_tags)