From 4cf1362e3b98256d0d018f42acd913bc56b97a27 Mon Sep 17 00:00:00 2001
From: "JMA (OpenERP)" <jma@tinyerp.com>
Date: Thu, 10 Jun 2010 19:04:19 +0530
Subject: [FIX] Security fixes for sql injections

bzr revid: jma@tinyerp.com-20100610133419-fwbc1xp0xoq77n90
---
 addons/idea/idea.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'addons/idea')

diff --git a/addons/idea/idea.py b/addons/idea/idea.py
index 14fb24ee607..171ff85505f 100644
--- a/addons/idea/idea.py
+++ b/addons/idea/idea.py
@@ -66,11 +66,11 @@ class idea_idea(osv.osv):
 
         sql = """SELECT i.id, avg(v.score::integer)
            FROM idea_idea i LEFT OUTER JOIN idea_vote v ON i.id = v.idea_id
-            WHERE i.id = ANY(%s)
+            WHERE i.id IN %s
             GROUP BY i.id
         """
 
-        cr.execute(sql, (ids,))
+        cr.execute(sql, (tuple(ids),))
         return dict(cr.fetchall())
 
     def _vote_count(self, cr, uid, ids, name, arg, context=None):
@@ -86,11 +86,11 @@ class idea_idea(osv.osv):
 
         sql = """SELECT i.id, COUNT(1)
            FROM idea_idea i LEFT OUTER JOIN idea_vote v ON i.id = v.idea_id
-            WHERE i.id = ANY(%s)
+            WHERE i.id IN %s
             GROUP BY i.id
         """
 
-        cr.execute(sql, (ids,))
+        cr.execute(sql, (tuple(ids),))
         return dict(cr.fetchall())
 
     def _comment_count(self, cr, uid, ids, name, arg, context=None):
@@ -106,11 +106,11 @@ class idea_idea(osv.osv):
 
         sql = """SELECT i.id, COUNT(1)
            FROM idea_idea i LEFT OUTER JOIN idea_comment c ON i.id = c.idea_id
-            WHERE i.id = ANY(%s)
+            WHERE i.id IN %s
             GROUP BY i.id
         """
 
-        cr.execute(sql, (ids,))
+        cr.execute(sql, (tuple(ids),))
         return dict(cr.fetchall())
 
     def _vote_read(self, cr, uid, ids, name, arg, context = None):
-- 
cgit v1.2.3


From 5c854d68caf08e1baecced7ec858c998e8b82d9e Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 16 Jun 2010 13:38:52 +0200
Subject: merge

bzr revid: fp@tinyerp.com-20100616113852-cj3dwha1w74l5q3w
---
 addons/idea/test/test_idea.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/idea')

diff --git a/addons/idea/test/test_idea.yml b/addons/idea/test/test_idea.yml
index 4c3f5301a5a..bcb764f8933 100644
--- a/addons/idea/test/test_idea.yml
+++ b/addons/idea/test/test_idea.yml
@@ -19,13 +19,13 @@
     user_id: base.user_root
     
 - |
-  I check that idea on draft state.
+  I check that the idea is in draft state.
 -
   !assert {model: idea.idea, id: idea_idea_0}:
     - state == 'draft'  
     
 - |
-  I open this idea by click on "Open" button.
+  I open this idea by clicking on the "Open" button.
 - 
   !workflow {model: idea.idea, action: idea_open, ref: idea_idea_0}
   
-- 
cgit v1.2.3


From 7095168648ba10fe246c5cf305377ae1209a41fe Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.com>
Date: Thu, 17 Jun 2010 17:46:52 +0530
Subject: [IMP]: Changed sequences of all main menus.

bzr revid: uco@tinyerp.com-20100617121652-5n6zb5zbk07pztn3
---
 addons/idea/idea_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/idea')

diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index ca46b31ace8..fe1022b9d5c 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -3,7 +3,7 @@
     <data>
 
     <!-- Idea Category Form View -->
-    <menuitem name="Tools" id="base.menu_tools" icon="STOCK_PREFERENCES" sequence="15"/>
+    <menuitem name="Tools" id="base.menu_tools" icon="STOCK_PREFERENCES" sequence="28"/>
         <record model="ir.ui.view" id="view_idea_category_form">
             <field name="name">idea.category.form</field>
             <field name="model">idea.category</field>
-- 
cgit v1.2.3


From 2b7a3224708ffaa823e311d331fbc89dfc5ed86d Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.com>
Date: Thu, 17 Jun 2010 19:14:20 +0530
Subject: [IMP]: Re-organized Tools menu structure.

bzr revid: uco@tinyerp.com-20100617134420-52257h3u0w6y7iux
---
 addons/idea/idea_view.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'addons/idea')

diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index fe1022b9d5c..d24ad041fee 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -44,9 +44,9 @@
     </record>
 
     <menuitem name="Configuration" parent="base.menu_tools"
-         id="base.menu_lunch_survey_root" sequence="6"/>
+         id="base.menu_lunch_survey_root" sequence="20"/>
 
-    <menuitem name="Ideas" parent="base.menu_lunch_survey_root" id="menu_ideas"/>
+    <menuitem name="Ideas" parent="base.menu_lunch_survey_root" id="menu_ideas" sequence="3"/>
 
     <menuitem name="Categories" parent="menu_ideas" id="menu_idea_category" action="action_idea_category" />
 
@@ -356,9 +356,9 @@
         <field name="view_type">form</field>
         <field name="view_mode">graph,tree</field>
     </record>
-    <menuitem name="Reporting" parent="base.menu_tools" id="base.menu_lunch_reporting" sequence="5"/>
+    <menuitem name="Reporting" parent="base.menu_tools" id="base.menu_lunch_reporting" sequence="6"/>
 
-    <menuitem name="Idea" parent="base.menu_lunch_reporting" id="menu_idea_reporting"/>
+    <menuitem name="Idea" parent="base.menu_lunch_reporting" id="menu_idea_reporting" sequence="3"/>
 
     <menuitem name="Vote Statistics" parent="menu_idea_reporting"
         id="menu_idea_vote_stat" action="action_idea_vote_stat" />
-- 
cgit v1.2.3