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

add parent US in task creation

stable
Juanfran 2015-06-11 12:33:15 +02:00
parent 58f4d684d9
commit 8e1b095f5c
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/locales/locale-en.json
View File

@ -1225,6 +1225,7 @@
"US_CREATED": "{{username}} has created a new US {{obj_name}} in {{project_name}}", "US_CREATED": "{{username}} has created a new US {{obj_name}} in {{project_name}}",
"ISSUE_CREATED": "{{username}} has created a new issue {{obj_name}} in {{project_name}}", "ISSUE_CREATED": "{{username}} has created a new issue {{obj_name}} in {{project_name}}",
"TASK_CREATED": "{{username}} has created a new task {{obj_name}} in {{project_name}}", "TASK_CREATED": "{{username}} has created a new task {{obj_name}} in {{project_name}}",
"TASK_CREATED_WITH_US": "{{username}} has created a new task {{obj_name}} in {{project_name}} which belongs to the US {{us_name}}",
"WIKI_CREATED": "{{username}} has created a new wiki page {{obj_name}} in {{project_name}}", "WIKI_CREATED": "{{username}} has created a new wiki page {{obj_name}} in {{project_name}}",
"MILESTONE_CREATED": "{{username}} has created a new sprint {{obj_name}} in {{project_name}}", "MILESTONE_CREATED": "{{username}} has created a new sprint {{obj_name}} in {{project_name}}",
"NEW_PROJECT": "{{username}} created the project {{project_name}}", "NEW_PROJECT": "{{username}} created the project {{project_name}}",

8
app/modules/user-timeline/user-timeline-item/user-timeline-item-type.service.coffee
View File

@ -45,10 +45,16 @@ timelineType = (timeline, event) ->
}, },
{ # NewTask { # NewTask
check: (timeline, event) -> check: (timeline, event) ->
return event.obj == 'task' && event.type == 'create' return event.obj == 'task' && event.type == 'create' && !timeline.data.task.userstory
key: 'TIMELINE.TASK_CREATED', key: 'TIMELINE.TASK_CREATED',
translate_params: ['username', 'project_name', 'obj_name'] translate_params: ['username', 'project_name', 'obj_name']
}, },
{ # NewTask with US
check: (timeline, event) ->
return event.obj == 'task' && event.type == 'create' && timeline.data.task.userstory
key: 'TIMELINE.TASK_CREATED_WITH_US',
translate_params: ['username', 'project_name', 'obj_name', 'us_name']
},
{ # NewMilestone { # NewMilestone
check: (timeline, event) -> check: (timeline, event) ->
return event.obj == 'milestone' && event.type == 'create' return event.obj == 'milestone' && event.type == 'create'