Vauxoo Addons

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

  1. 7.0-improvements_user_story-dev-yani
  2. Merge into 7.0
Proposed by Yanina Aular (Vauxoo)
Status: Merged
Merged at revision: 1038
Proposed branch: lp:~vauxoo/addons-vauxoo/7.0-improvements_user_story-dev-yani
Merge into: lp:addons-vauxoo/7.0
Diff against target: 101 lines (+18/-12)
3 files modified
user_story/demo/demo.xml (+3/-3)
user_story/model/user_story.py (+12/-6)
user_story/view/userstory_view.xml (+3/-3)
To merge this branch: bzr merge lp:~vauxoo/addons-vauxoo/7.0-improvements_user_story-dev-yani
Reviewer Review Type Date Requested Status
Yanina Aular (Vauxoo) Approve
Jose Antonio Morales Ponce(vauxoo) - - http://www.vauxoo.com Pending
Review via email: mp+222364@code.launchpad.net

Description of the change

Delete owner char field of user story

To post a comment you must log in.
Revision history for this message
Yanina Aular (Vauxoo) (yanina-aular) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'user_story/demo/demo.xml'
2--- user_story/demo/demo.xml 2014-05-09 21:51:34 +0000
3+++ user_story/demo/demo.xml 2014-06-06 16:17:46 +0000
4@@ -4,19 +4,19 @@
5
6 <record id="us_1" model="user.story">
7 <field name="name">us 1</field>
8- <field name="owner">ow 1</field>
9+ <field name="owner_id" ref="base.user_root"/>
10 <field name="project_id" ref="project.project_project_1"/>
11 </record>
12
13 <record id="us_2" model="user.story">
14 <field name="name">us 2</field>
15- <field name="owner">ow 2</field>
16+ <field name="owner_id" ref="base.user_root"/>
17 <field name="project_id" ref="project.project_project_1"/>
18 </record>
19
20 <record id="us_3" model="user.story">
21 <field name="name">us 3</field>
22- <field name="owner">ow 3</field>
23+ <field name="owner_id" ref="base.user_root"/>
24 <field name="project_id" ref="project.project_project_2"/>
25 </record>
26
27
28=== modified file 'user_story/model/user_story.py'
29--- user_story/model/user_story.py 2014-05-28 23:15:28 +0000
30+++ user_story/model/user_story.py 2014-06-06 16:17:46 +0000
31@@ -101,9 +101,18 @@
32 user_id = self.pool.get('res.users').browse(cr,uid,[uid],context=context)[0]
33 hu = self.browse(cr, uid, ids[0], context=context)
34
35- body_html = body_html.replace('NAME_OWNER', hu.owner)
36+ if hu.owner_id and hu.owner_id.name:
37+ body_html = body_html.replace('NAME_OWNER', hu.owner_id.name)
38+ else:
39+ body_html = body_html.replace('NAME_OWNER', '')
40+
41 body_html = body_html.replace('NAME_USER', user_id.name)
42- body_html = body_html.replace('NAME_CRI', criteria)
43+
44+ if criteria:
45+ body_html = body_html.replace('NAME_CRI', criteria)
46+ else:
47+ body_html = body_html.replace('NAME_CRI', 'None')
48+
49 body_html = body_html.replace('NAME_HU', hu.name)
50
51 return body_html
52@@ -121,9 +130,7 @@
53 user_obj = self.pool.get('res.users')
54 hu = self.browse(cr, uid, res_id, context=context)
55
56- owner_name = unicodedata.normalize('NFKD', hu.owner)
57- owner_name = owner_name.encode('ASCII','ignore')
58- owner_id = user_obj.search(cr, uid, [('name','=',owner_name)], context=context)
59+ owner_id = hu.owner_id
60
61 if hu.user_id and hu.user_id.partner_id:
62 followers.append(hu.user_id.partner_id.id)
63@@ -188,7 +195,6 @@
64
65 _columns = {
66 'name': fields.char('Title', size=255, required=True, readonly=False, translate=True),
67- 'owner': fields.char('Owner', size=255, readonly=False),
68 'owner_id': fields.many2one('res.users', 'Owner', help="User Story's Owner"),
69 'code': fields.char('Code', size=64, readonly=False),
70 'planned_hours': fields.float('Planned Hours'),
71
72=== modified file 'user_story/view/userstory_view.xml'
73--- user_story/view/userstory_view.xml 2014-05-09 21:51:34 +0000
74+++ user_story/view/userstory_view.xml 2014-06-06 16:17:46 +0000
75@@ -39,7 +39,7 @@
76 <h2><field name="name"/></h2>
77 <group>
78 <group>
79- <field name="owner_id" select="1"/>
80+ <field name="owner_id" select="1" required="1"/>
81 <field name="date" select="1"/>
82 <field name="user_id"/>
83 <field name="user_execute_id"/>
84@@ -250,7 +250,7 @@
85 <field name="project_id"/>
86 <field name="code"/>
87 <field name="name"/>
88- <field name="owner"/>
89+ <field name="owner_id"/>
90 <field name="description"/>
91 <field name="user_id"/>
92 <field name="sk_id"/>
93@@ -261,7 +261,7 @@
94 <group expand="1" string="Group By...">
95 <filter name="user_story_project" icon="STOCK_INDEX" string="Project" context="{'group_by':'project_id'}" />
96 <separator orientation="vertical" />
97- <filter name="user_story_owner" icon="terp-personal" string="Owner" context="{'group_by':'owner'}" />
98+ <filter name="user_story_owner" icon="terp-personal" string="Owner" context="{'group_by':'owner_id'}" />
99 <separator orientation="vertical" />
100 <filter name="user_story_user_id" icon="terp-personal" string="User" context="{'group_by':'user_id'}" />
101 <separator orientation="vertical" />