Merge lp:~vauxoo/addons-vauxoo/7.0-userstory_domain_project_task-dev-yani into lp:addons-vauxoo/7.0

Proposed by Yanina Aular (Vauxoo)
Status: Merged
Merged at revision: 850
Proposed branch: lp:~vauxoo/addons-vauxoo/7.0-userstory_domain_project_task-dev-yani
Merge into: lp:addons-vauxoo/7.0
Diff against target: 25 lines (+2/-2)
2 files modified
user_story/view/project_view.xml (+1/-1)
user_story/view/userstory_view.xml (+1/-1)
To merge this branch: bzr merge lp:~vauxoo/addons-vauxoo/7.0-userstory_domain_project_task-dev-yani
Reviewer Review Type Date Requested Status
Gabriela Quilarque Approve
Review via email: mp+190148@code.launchpad.net

This proposal supersedes a proposal from 2013-10-09.

Description of the change

User stories are displayed in a task filter on condition that the user story project should be the same as the task.

Link page renamed to Task.

To post a comment you must log in.
Revision history for this message
Gabriela Quilarque (gabrielaquilarque97) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'user_story/view/project_view.xml'
2--- user_story/view/project_view.xml 2013-08-20 18:03:58 +0000
3+++ user_story/view/project_view.xml 2013-10-09 14:30:25 +0000
4@@ -10,7 +10,7 @@
5
6
7 <xpath expr="//field[@name='date_deadline']" position="after">
8- <field name="userstory_id" on_change="onchange_user_story_task(userstory_id)"/>
9+ <field name="userstory_id" on_change="onchange_user_story_task(userstory_id)" domain="[('project_id','=',project_id)]"/>
10 </xpath>
11
12 </field>
13
14=== modified file 'user_story/view/userstory_view.xml'
15--- user_story/view/userstory_view.xml 2013-07-25 18:17:51 +0000
16+++ user_story/view/userstory_view.xml 2013-10-09 14:30:25 +0000
17@@ -100,7 +100,7 @@
18 <field name="asumption" colspan="4" placeholder="Add a asumptions here ..."/>
19 </page>
20
21- <page string="Link">
22+ <page string="Tasks">
23 <separator string="Tasks" colspan='4' />
24 <field name="task_ids" context="{'project_task':project_id,'categ_task':categ_ids,'sprint_task':sk_id,'userstory_task':active_id}" colspan="4" nolabel="1" widget="many2many"/>
25 </page>