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
=== modified file 'user_story/demo/demo.xml'
--- user_story/demo/demo.xml 2014-05-09 21:51:34 +0000
+++ user_story/demo/demo.xml 2014-06-06 16:17:46 +0000
@@ -4,19 +4,19 @@
44
5 <record id="us_1" model="user.story">5 <record id="us_1" model="user.story">
6 <field name="name">us 1</field>6 <field name="name">us 1</field>
7 <field name="owner">ow 1</field>7 <field name="owner_id" ref="base.user_root"/>
8 <field name="project_id" ref="project.project_project_1"/>8 <field name="project_id" ref="project.project_project_1"/>
9 </record>9 </record>
1010
11 <record id="us_2" model="user.story">11 <record id="us_2" model="user.story">
12 <field name="name">us 2</field>12 <field name="name">us 2</field>
13 <field name="owner">ow 2</field>13 <field name="owner_id" ref="base.user_root"/>
14 <field name="project_id" ref="project.project_project_1"/>14 <field name="project_id" ref="project.project_project_1"/>
15 </record>15 </record>
1616
17 <record id="us_3" model="user.story">17 <record id="us_3" model="user.story">
18 <field name="name">us 3</field>18 <field name="name">us 3</field>
19 <field name="owner">ow 3</field>19 <field name="owner_id" ref="base.user_root"/>
20 <field name="project_id" ref="project.project_project_2"/>20 <field name="project_id" ref="project.project_project_2"/>
21 </record>21 </record>
2222
2323
=== modified file 'user_story/model/user_story.py'
--- user_story/model/user_story.py 2014-05-28 23:15:28 +0000
+++ user_story/model/user_story.py 2014-06-06 16:17:46 +0000
@@ -101,9 +101,18 @@
101 user_id = self.pool.get('res.users').browse(cr,uid,[uid],context=context)[0]101 user_id = self.pool.get('res.users').browse(cr,uid,[uid],context=context)[0]
102 hu = self.browse(cr, uid, ids[0], context=context)102 hu = self.browse(cr, uid, ids[0], context=context)
103103
104 body_html = body_html.replace('NAME_OWNER', hu.owner)104 if hu.owner_id and hu.owner_id.name:
105 body_html = body_html.replace('NAME_OWNER', hu.owner_id.name)
106 else:
107 body_html = body_html.replace('NAME_OWNER', '')
108
105 body_html = body_html.replace('NAME_USER', user_id.name)109 body_html = body_html.replace('NAME_USER', user_id.name)
106 body_html = body_html.replace('NAME_CRI', criteria)110
111 if criteria:
112 body_html = body_html.replace('NAME_CRI', criteria)
113 else:
114 body_html = body_html.replace('NAME_CRI', 'None')
115
107 body_html = body_html.replace('NAME_HU', hu.name)116 body_html = body_html.replace('NAME_HU', hu.name)
108 117
109 return body_html118 return body_html
@@ -121,9 +130,7 @@
121 user_obj = self.pool.get('res.users')130 user_obj = self.pool.get('res.users')
122 hu = self.browse(cr, uid, res_id, context=context)131 hu = self.browse(cr, uid, res_id, context=context)
123 132
124 owner_name = unicodedata.normalize('NFKD', hu.owner)133 owner_id = hu.owner_id
125 owner_name = owner_name.encode('ASCII','ignore')
126 owner_id = user_obj.search(cr, uid, [('name','=',owner_name)], context=context)
127 134
128 if hu.user_id and hu.user_id.partner_id:135 if hu.user_id and hu.user_id.partner_id:
129 followers.append(hu.user_id.partner_id.id)136 followers.append(hu.user_id.partner_id.id)
@@ -188,7 +195,6 @@
188195
189 _columns = {196 _columns = {
190 'name': fields.char('Title', size=255, required=True, readonly=False, translate=True),197 'name': fields.char('Title', size=255, required=True, readonly=False, translate=True),
191 'owner': fields.char('Owner', size=255, readonly=False),
192 'owner_id': fields.many2one('res.users', 'Owner', help="User Story's Owner"),198 'owner_id': fields.many2one('res.users', 'Owner', help="User Story's Owner"),
193 'code': fields.char('Code', size=64, readonly=False),199 'code': fields.char('Code', size=64, readonly=False),
194 'planned_hours': fields.float('Planned Hours'),200 'planned_hours': fields.float('Planned Hours'),
195201
=== modified file 'user_story/view/userstory_view.xml'
--- user_story/view/userstory_view.xml 2014-05-09 21:51:34 +0000
+++ user_story/view/userstory_view.xml 2014-06-06 16:17:46 +0000
@@ -39,7 +39,7 @@
39 <h2><field name="name"/></h2>39 <h2><field name="name"/></h2>
40 <group>40 <group>
41 <group>41 <group>
42 <field name="owner_id" select="1"/>42 <field name="owner_id" select="1" required="1"/>
43 <field name="date" select="1"/>43 <field name="date" select="1"/>
44 <field name="user_id"/>44 <field name="user_id"/>
45 <field name="user_execute_id"/>45 <field name="user_execute_id"/>
@@ -250,7 +250,7 @@
250 <field name="project_id"/>250 <field name="project_id"/>
251 <field name="code"/>251 <field name="code"/>
252 <field name="name"/>252 <field name="name"/>
253 <field name="owner"/>253 <field name="owner_id"/>
254 <field name="description"/>254 <field name="description"/>
255 <field name="user_id"/>255 <field name="user_id"/>
256 <field name="sk_id"/>256 <field name="sk_id"/>
@@ -261,7 +261,7 @@
261 <group expand="1" string="Group By...">261 <group expand="1" string="Group By...">
262 <filter name="user_story_project" icon="STOCK_INDEX" string="Project" context="{'group_by':'project_id'}" />262 <filter name="user_story_project" icon="STOCK_INDEX" string="Project" context="{'group_by':'project_id'}" />
263 <separator orientation="vertical" />263 <separator orientation="vertical" />
264 <filter name="user_story_owner" icon="terp-personal" string="Owner" context="{'group_by':'owner'}" />264 <filter name="user_story_owner" icon="terp-personal" string="Owner" context="{'group_by':'owner_id'}" />
265 <separator orientation="vertical" />265 <separator orientation="vertical" />
266 <filter name="user_story_user_id" icon="terp-personal" string="User" context="{'group_by':'user_id'}" />266 <filter name="user_story_user_id" icon="terp-personal" string="User" context="{'group_by':'user_id'}" />
267 <separator orientation="vertical" />267 <separator orientation="vertical" />