Merge lp:~vauxoo/addons-vauxoo/7.0-user_story_fix1-kty into lp:addons-vauxoo/7.0

[Katherine Zaoral (Vauxoo)]

[MERGE] fix task_ids field in the user story model and remove unnecessary and unsupported group by filter.

[Katherine Zaoral (Vauxoo) (kathy-zaoral)]

LGTM.
I am waiting forthe runbot result.

[Katherine Zaoral (Vauxoo) (kathy-zaoral)]

ready the runnbot is green and the change was approved

review: Approve

=== modified file 'user_story/model/user_story.py'
--- user_story/model/user_story.py	2014-04-10 20:29:24 +0000
+++ user_story/model/user_story.py	2014-04-21 17:23:51 +0000
@@ -39,37 +39,6 @@
     _description = 'User Story'
     _inherit = ['mail.thread']
 
-    def _get_tasks(self, cr, uid, ids, field_name, arg, context=None):
-        if context is None:
-            context = {}
-        result = {}
-        task_obj = self.pool.get('project.task')
-        for orderpoint in self.browse(cr, uid, ids, context=context):
-            task_ids = task_obj.search(cr, uid, [
-                                       ('userstory_id', '=', orderpoint.id)])
-            result[orderpoint.id] = task_ids
-        return result
-
-    def _set_task(self, cr, uid, id, name, value, arg, ctx=None):
-
-        task_ids = self.pool.get('project.task').search(
-            cr, uid, [("userstory_id", '=', id)])
-        task_id = list(set(value[0][2]) - set(task_ids))
-        if task_id:
-            for i in task_id:
-                sql_str = """UPDATE project_task set
-                            userstory_id='%s'
-                            WHERE id=%s """ % (id, i)
-                cr.execute(sql_str)
-        else:
-            task_id = list(set(task_ids) - set(value[0][2]))
-            for i in task_id:
-                    sql_str = """UPDATE project_task set
-                                userstory_id=Null
-                                WHERE id=%s """ % (i)
-                    cr.execute(sql_str)
-        return True
-
     def write(self, cr, uid, ids, vals, context=None):
         task_obj = self.pool.get('project.task')
         
@@ -216,13 +185,11 @@
         'user_execute_id': fields.many2one('res.users', 'Execution Responsible',help="Person responsible for user story takes place, either by delegating work to other human resource or running it by itself. For delegate work should monitor the proper implementation of associated activities."),
         'sk_id': fields.many2one('sprint.kanban', 'Sprint Kanban'),
         'state': fields.selection(_US_STATE, 'State', readonly=True),
-        'task_ids': fields.function(_get_tasks, type='many2many',
-                                    relation="project.task",
-                                    fnct_inv=_set_task,
-                                    string="Tasks",
-                                    help="""Draft procurement of
-                                            the product and location
-                                            of that orderpoint"""),
+        'task_ids': fields.one2many(
+            'project.task', 'userstory_id',
+            string="Tasks",
+            help=("Draft procurement of the product and location of that"
+                  " orderpoint")),
         'categ_ids': fields.many2many('project.category','project_category_user_story_rel','userstory_id','categ_id', string="Tags"),
         'implementation': fields.text('Implementation Conclusions', translate=True),
     }
 
=== modified file 'user_story/view/userstory_view.xml'
--- user_story/view/userstory_view.xml	2014-03-26 17:42:14 +0000
+++ user_story/view/userstory_view.xml	2014-04-21 17:23:51 +0000
@@ -249,8 +249,6 @@
             <separator orientation="vertical" />
             <filter name="user_story_sk_id" icon="terp-personal" string="Sprint" context="{'group_by':'sk_id'}" />
             <separator orientation="vertical" />
-            <filter name="user_story_task_ids" icon="terp-personal" string="Task" context="{'group_by':'task_ids'}" />
-            <separator orientation="vertical" />
             <filter name="priority_level" icon="terp-personal" string="Priority Level" context="{'group_by':'priority_level'}" />
             <separator orientation="vertical" />
             <filter name="state" icon="terp-personal" string="States" context="{'group_by':'state'}" />