From a578d8a6bfd93daacb709ff48e0665bb901e7d20 Mon Sep 17 00:00:00 2001
From: "vda (Open ERP)" <vda@tinyerp.com>
Date: Thu, 18 Nov 2010 15:08:45 +0530
Subject: [PATCH 1/8] [FIX] Widget per user.

bzr revid: vda@tinyerp.com-20101118093845-l94t2z4qw9kc4dse
---
 bin/addons/base/res/res_widget.py       |  9 +++++----
 bin/addons/base/res/res_widget_view.xml | 25 +++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/bin/addons/base/res/res_widget.py b/bin/addons/base/res/res_widget.py
index 14b7338bde0..eddb432dfde 100644
--- a/bin/addons/base/res/res_widget.py
+++ b/bin/addons/base/res/res_widget.py
@@ -41,15 +41,16 @@ res_widget_user()
 
 class res_widget_wizard(osv.osv_memory):
     _name = "res.widget.wizard"
-    _description = "Add a widget"
+    _description = "Add a widget for User"
     _columns = {
-        'widget_id': fields.one2many("res.widget", 'Widget', required=True),
+        'widget_id': fields.many2one("res.widget", 'Widget', required=1),
     }
-    def widget_add(self, cr, uid, ids, context=None):
+    
+    def add_res_widget(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
         wizard = self.read(cr, uid, ids)[0]
         self.pool.get('res.widget.user').create(cr, uid, {'user_id':uid, 'widget_id':wizard['widget_id']})
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 res_widget_wizard()
 
diff --git a/bin/addons/base/res/res_widget_view.xml b/bin/addons/base/res/res_widget_view.xml
index b139f774f9b..4e29d4f493f 100644
--- a/bin/addons/base/res/res_widget_view.xml
+++ b/bin/addons/base/res/res_widget_view.xml
@@ -74,6 +74,31 @@
         </record>
         <menuitem action="res_widget_user_act_window" id="menu_res_widget_user_act_window" parent="base.next_id_2"
             groups="base.group_no_one"/>
+        
+        <record id="view_res_widget_wizard" model="ir.ui.view">
+            <field name="name">Widget Wizard</field>
+            <field name="model">res.widget.wizard</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+              <form string="Widget Wizard" col="4">
+                <field name="widget_id"/>
+                <newline/>
+                <separator string="" colspan="6"/>
+                <group colspan="6" col="4" >
+                <button special="cancel" string="Cancel" icon="gtk-cancel" />
+                <button name="add_res_widget" string="Add" type="object"/>
+                </group>
+            </form>
+            </field>
+        </record>
+        
+        <act_window name="Add Wizard"
+            res_model="res.widget.wizard"
+            src_model="res.widget.user"
+            view_mode="form"
+            target="new"
+            key2="client_action_multi"
+            id="action_res_widget_wizard"/>
 
 <!--
         <record id="view_res_widget_wizard" model="ir.ui.view">

From 6de2cd6324333cd07d064a213e2f062dd994a019 Mon Sep 17 00:00:00 2001
From: "vda (Open ERP)" <vda@tinyerp.com>
Date: Wed, 24 Nov 2010 17:32:30 +0530
Subject: [PATCH 2/8] [FIX] Add openERP favourites global widget for all user.

bzr revid: vda@tinyerp.com-20101124120230-f4stb8s372dubkti
---
 bin/addons/base/res/res_widget_data.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/bin/addons/base/res/res_widget_data.xml b/bin/addons/base/res/res_widget_data.xml
index a8375651b8a..e360409daca 100644
--- a/bin/addons/base/res/res_widget_data.xml
+++ b/bin/addons/base/res/res_widget_data.xml
@@ -38,5 +38,8 @@ new TWTR.Widget({
 }).render().setUser('openerp').start();
 </script>]]> </field>
     </record>
+    <record id="openerp_favorites" model="res.widget.user">
+        <field name="widget_id" ref="openerp_twitter_favorites"/>
+    </record>
   </data>
 </openerp>

From b676fca5e3755f268d99b00664ad571fd7e2db9e Mon Sep 17 00:00:00 2001
From: "vda (Open ERP)" <vda@tinyerp.com>
Date: Wed, 24 Nov 2010 19:02:05 +0530
Subject: [PATCH 3/8] [FIX] Minor changes for wizard view action.

bzr revid: vda@tinyerp.com-20101124133205-puhsrloz66y96hbz
---
 bin/addons/base/res/res_widget.py       |  2 +-
 bin/addons/base/res/res_widget_view.xml | 29 ++++---------------------
 2 files changed, 5 insertions(+), 26 deletions(-)

diff --git a/bin/addons/base/res/res_widget.py b/bin/addons/base/res/res_widget.py
index eddb432dfde..bbbfe4fd810 100644
--- a/bin/addons/base/res/res_widget.py
+++ b/bin/addons/base/res/res_widget.py
@@ -35,7 +35,7 @@ class res_widget_user(osv.osv):
     _columns = {
         'sequence': fields.integer('Sequence'),
         'user_id': fields.many2one('res.users','User', select=1),
-        'widget_id': fields.many2one('res.widget','Widget',required=1),
+        'widget_id': fields.many2one('res.widget','Widget',required=True),
     }
 res_widget_user()
 
diff --git a/bin/addons/base/res/res_widget_view.xml b/bin/addons/base/res/res_widget_view.xml
index 4e29d4f493f..6e3d6aec7ab 100644
--- a/bin/addons/base/res/res_widget_view.xml
+++ b/bin/addons/base/res/res_widget_view.xml
@@ -75,8 +75,10 @@
         <menuitem action="res_widget_user_act_window" id="menu_res_widget_user_act_window" parent="base.next_id_2"
             groups="base.group_no_one"/>
         
+        
+
         <record id="view_res_widget_wizard" model="ir.ui.view">
-            <field name="name">Widget Wizard</field>
+            <field name="name">Res Widget Wizard</field>
             <field name="model">res.widget.wizard</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
@@ -86,34 +88,11 @@
                 <separator string="" colspan="6"/>
                 <group colspan="6" col="4" >
                 <button special="cancel" string="Cancel" icon="gtk-cancel" />
-                <button name="add_res_widget" string="Add" type="object"/>
+                <button name="res_widget_add" string="Add" type="object"/>
                 </group>
             </form>
             </field>
         </record>
-        
-        <act_window name="Add Wizard"
-            res_model="res.widget.wizard"
-            src_model="res.widget.user"
-            view_mode="form"
-            target="new"
-            key2="client_action_multi"
-            id="action_res_widget_wizard"/>
-
-<!--
-        <record id="view_res_widget_wizard" model="ir.ui.view">
-            <field name="name">Res Widget Wizard</field>
-            <field name="model">res.widget.wizard</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-              <form string="Res Widget" col="4">
-                <field name="res_widget"/>
-                <newline/>
-                <button name="res_widget_add" string="Add Widget" type="object"/>
-            </form>
-            </field>
-        </record>
         <act_window name="Res Widget Wizard" res_model="res.widget.wizard" src_model="res.widget.user" view_mode="form" target="new" key2="client_action_multi" id="action_res_widget_wizard"/>
--->
     </data>
 </openerp>

From 4716280311236df7c099d3651538fc7032cfaaac Mon Sep 17 00:00:00 2001
From: "vda (Open ERP)" <vda@tinyerp.com>
Date: Wed, 24 Nov 2010 19:05:01 +0530
Subject: [PATCH 4/8] [FIX] proper function name.

bzr revid: vda@tinyerp.com-20101124133501-tda7mokabltu8gmr
---
 bin/addons/base/res/res_widget.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/addons/base/res/res_widget.py b/bin/addons/base/res/res_widget.py
index bbbfe4fd810..e8589dc7cba 100644
--- a/bin/addons/base/res/res_widget.py
+++ b/bin/addons/base/res/res_widget.py
@@ -46,7 +46,7 @@ class res_widget_wizard(osv.osv_memory):
         'widget_id': fields.many2one("res.widget", 'Widget', required=1),
     }
     
-    def add_res_widget(self, cr, uid, ids, context=None):
+    def res_widget_add(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
         wizard = self.read(cr, uid, ids)[0]

From 097340e9a7388846128bdbb0442c2b7619abf8d5 Mon Sep 17 00:00:00 2001
From: "vda (Open ERP)" <vda@tinyerp.com>
Date: Wed, 24 Nov 2010 19:18:14 +0530
Subject: [PATCH 5/8] [FIX] Changed wizard field to many2many.

bzr revid: vda@tinyerp.com-20101124134814-0sm2ovho7uhglew7
---
 bin/addons/base/res/res_widget.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/bin/addons/base/res/res_widget.py b/bin/addons/base/res/res_widget.py
index e8589dc7cba..17617eeb39c 100644
--- a/bin/addons/base/res/res_widget.py
+++ b/bin/addons/base/res/res_widget.py
@@ -43,14 +43,15 @@ class res_widget_wizard(osv.osv_memory):
     _name = "res.widget.wizard"
     _description = "Add a widget for User"
     _columns = {
-        'widget_id': fields.many2one("res.widget", 'Widget', required=1),
+        'widget_id': fields.many2many("res.widget", "res_widget_user_rel", "uid", "wid", "Widget"),
     }
     
     def res_widget_add(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
         wizard = self.read(cr, uid, ids)[0]
-        self.pool.get('res.widget.user').create(cr, uid, {'user_id':uid, 'widget_id':wizard['widget_id']})
+        for wiz_id in wizard['widget_id']:
+            self.pool.get('res.widget.user').create(cr, uid, {'user_id':uid, 'widget_id':wiz_id})
         return {'type': 'ir.actions.act_window_close'}
 res_widget_wizard()
 

From ec4644c6f1a98da34713970672ec12f4804eb1a1 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 25 Nov 2010 12:09:00 +0100
Subject: [PATCH 6/8] [ADD] some more twitter widget for demo

bzr revid: xmo@openerp.com-20101125110900-6utcye5hs2p3zpx0
---
 bin/addons/base/__openerp__.py          |   1 +
 bin/addons/base/res/res_widget.py       |   1 -
 bin/addons/base/res/res_widget_data.xml | 190 +++++++++++++++++++++++-
 bin/addons/base/res/res_widget_demo.xml |  13 ++
 4 files changed, 202 insertions(+), 3 deletions(-)
 create mode 100644 bin/addons/base/res/res_widget_demo.xml

diff --git a/bin/addons/base/__openerp__.py b/bin/addons/base/__openerp__.py
index 492c397754d..b0d519e51c3 100644
--- a/bin/addons/base/__openerp__.py
+++ b/bin/addons/base/__openerp__.py
@@ -81,6 +81,7 @@
         'base_demo.xml',
         'res/partner/partner_demo.xml',
         'res/partner/crm_demo.xml',
+        'res/res_widget_demo.xml',
     ],
     'test': [
         'test/base_test.xml',
diff --git a/bin/addons/base/res/res_widget.py b/bin/addons/base/res/res_widget.py
index 17617eeb39c..b917ea9e24e 100644
--- a/bin/addons/base/res/res_widget.py
+++ b/bin/addons/base/res/res_widget.py
@@ -54,4 +54,3 @@ class res_widget_wizard(osv.osv_memory):
             self.pool.get('res.widget.user').create(cr, uid, {'user_id':uid, 'widget_id':wiz_id})
         return {'type': 'ir.actions.act_window_close'}
 res_widget_wizard()
-
diff --git a/bin/addons/base/res/res_widget_data.xml b/bin/addons/base/res/res_widget_data.xml
index e360409daca..1e64955da1a 100644
--- a/bin/addons/base/res/res_widget_data.xml
+++ b/bin/addons/base/res/res_widget_data.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
   <data>
-    <record id="openerp_twitter_favorites" model="res.widget">
+    <record id="openerp_favorites_twitter_widget" model="res.widget">
       <field name="title">OpenERP Favorites</field>
       <field name="content"><![CDATA[
 <script type="text/javascript" src="http://widgets.twimg.com/j/2/widget.js"></script>
@@ -38,8 +38,194 @@ new TWTR.Widget({
 }).render().setUser('openerp').start();
 </script>]]> </field>
     </record>
+
+    <record id="odony_twitter_widget" model="res.widget">
+      <field name="title">Olivier Dony's tweets</field>
+      <field name="content"><![CDATA[<script src="http://widgets.twimg.com/j/2/widget.js"></script>
+<script>
+new TWTR.Widget({
+  version: 2,
+  type: 'profile',
+  rpp: 10,
+  interval: 6000,
+  title: '',
+  subject: '',
+  width: 'auto',
+  height: 300,
+  theme: {
+    shell: {
+      background: '#F0EEEE',
+      color: '#444444'
+    },
+    tweets: {
+      background: '#F0EEEE',
+      color: '#444444',
+      links: '#9A0404'
+    }
+  },
+  features: {
+    scrollbar: false,
+    loop: false,
+    live: true,
+    hashtags: true,
+    timestamp: true,
+    avatars: false,
+    behavior: 'all'
+  }
+}).render().setUser('odony').start();
+</script>]]></field>
+    </record>
+
+    <record id="matrixise_twitter_widget" model="res.widget">
+      <field name="title">Stéphane Wirtel's tweets</field>
+      <field name="content"><![CDATA[<script src="http://widgets.twimg.com/j/2/widget.js"></script>
+<script>
+new TWTR.Widget({
+  version: 2,
+  type: 'profile',
+  rpp: 10,
+  interval: 6000,
+  title: '',
+  subject: '',
+  width: 'auto',
+  height: 300,
+  theme: {
+    shell: {
+      background: '#F0EEEE',
+      color: '#444444'
+    },
+    tweets: {
+      background: '#F0EEEE',
+      color: '#444444',
+      links: '#9A0404'
+    }
+  },
+  features: {
+    scrollbar: false,
+    loop: false,
+    live: true,
+    hashtags: true,
+    timestamp: true,
+    avatars: false,
+    behavior: 'all'
+  }
+}).render().setUser('matrixise').start();
+</script>]]></field>
+    </record>
+
+    <record id="rvalyi_twitter_widget" model="res.widget">
+      <field name="title">Raphaël Valyi's tweets</field>
+      <field name="content"><![CDATA[<script src="http://widgets.twimg.com/j/2/widget.js"></script>
+<script>
+new TWTR.Widget({
+  version: 2,
+  type: 'profile',
+  rpp: 10,
+  interval: 6000,
+  title: '',
+  subject: '',
+  width: 'auto',
+  height: 300,
+  theme: {
+    shell: {
+      background: '#F0EEEE',
+      color: '#444444'
+    },
+    tweets: {
+      background: '#F0EEEE',
+      color: '#444444',
+      links: '#9A0404'
+    }
+  },
+  features: {
+    scrollbar: false,
+    loop: false,
+    live: true,
+    hashtags: true,
+    timestamp: true,
+    avatars: false,
+    behavior: 'all'
+  }
+}).render().setUser('rvalyi').start();
+</script>]]></field>
+    </record>
+
+    <record id="albertnan_twitter_widget" model="res.widget">
+      <field name="title">Albert Cervera Areny's tweets</field>
+      <field name="content"><![CDATA[<script src="http://widgets.twimg.com/j/2/widget.js"></script>
+<script>
+new TWTR.Widget({
+  version: 2,
+  type: 'profile',
+  rpp: 10,
+  interval: 6000,
+  title: '',
+  subject: '',
+  width: 'auto',
+  height: 300,
+  theme: {
+    shell: {
+      background: '#F0EEEE',
+      color: '#444444'
+    },
+    tweets: {
+      background: '#F0EEEE',
+      color: '#444444',
+      links: '#9A0404'
+    }
+  },
+  features: {
+    scrollbar: false,
+    loop: false,
+    live: true,
+    hashtags: true,
+    timestamp: true,
+    avatars: false,
+    behavior: 'all'
+  }
+}).render().setUser('albertnan').start();
+</script>]]></field>
+    </record>
+
+    <record id="nhomar_twitter_widget" model="res.widget">
+      <field name="title">Nhomar Hernandez's tweets</field>
+      <field name="content"><![CDATA[<script src="http://widgets.twimg.com/j/2/widget.js"></script>
+<script>
+new TWTR.Widget({
+  version: 2,
+  type: 'profile',
+  rpp: 10,
+  interval: 6000,
+  title: '',
+  subject: '',
+  width: 'auto',
+  height: 300,
+  theme: {
+    shell: {
+      background: '#F0EEEE',
+      color: '#444444'
+    },
+    tweets: {
+      background: '#F0EEEE',
+      color: '#444444',
+      links: '#9A0404'
+    }
+  },
+  features: {
+    scrollbar: false,
+    loop: false,
+    live: true,
+    hashtags: true,
+    timestamp: true,
+    avatars: false,
+    behavior: 'all'
+  }
+}).render().setUser('nhomar').start();
+</script>]]></field>
+    </record>
+
     <record id="openerp_favorites" model="res.widget.user">
-        <field name="widget_id" ref="openerp_twitter_favorites"/>
+        <field name="widget_id" ref="openerp_favorites_twitter_widget"/>
     </record>
   </data>
 </openerp>
diff --git a/bin/addons/base/res/res_widget_demo.xml b/bin/addons/base/res/res_widget_demo.xml
new file mode 100644
index 00000000000..6ffe9bfb182
--- /dev/null
+++ b/bin/addons/base/res/res_widget_demo.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+  <data>
+    <record id="openerp_admin_widgets" model="res.widget.user">
+        <field name="widget_id" ref="odony_twitter_widget"/>
+        <field name="user_id" ref="base.user_root"/>
+    </record>
+    <record id="openerp_demo_widgets" model="res.widget.user">
+        <field name="widget_id" ref="albertnan_twitter_widget"/>
+        <field name="user_id" ref="base.user_demo"/>
+    </record>
+  </data>
+</openerp>

From 1da6f30f2b1d0003c5a8d81326948f81e3eb4c6a Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 25 Nov 2010 13:48:11 +0100
Subject: [PATCH 7/8] [FIX] res_widget: improve some labels/names

bzr revid: xmo@openerp.com-20101125124811-mrw9xa99bjurwm0h
---
 bin/addons/base/res/res_widget_view.xml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/bin/addons/base/res/res_widget_view.xml b/bin/addons/base/res/res_widget_view.xml
index 6e3d6aec7ab..91b108257dc 100644
--- a/bin/addons/base/res/res_widget_view.xml
+++ b/bin/addons/base/res/res_widget_view.xml
@@ -74,11 +74,9 @@
         </record>
         <menuitem action="res_widget_user_act_window" id="menu_res_widget_user_act_window" parent="base.next_id_2"
             groups="base.group_no_one"/>
-        
-        
 
         <record id="view_res_widget_wizard" model="ir.ui.view">
-            <field name="name">Res Widget Wizard</field>
+            <field name="name">Homepage Widgets Management</field>
             <field name="model">res.widget.wizard</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
@@ -87,12 +85,15 @@
                 <newline/>
                 <separator string="" colspan="6"/>
                 <group colspan="6" col="4" >
-                <button special="cancel" string="Cancel" icon="gtk-cancel" />
-                <button name="res_widget_add" string="Add" type="object"/>
+                  <button special="cancel" string="Cancel" icon="gtk-cancel" />
+                  <button name="res_widget_add" string="Add" type="object"/>
                 </group>
             </form>
             </field>
         </record>
-        <act_window name="Res Widget Wizard" res_model="res.widget.wizard" src_model="res.widget.user" view_mode="form" target="new" key2="client_action_multi" id="action_res_widget_wizard"/>
+        <act_window name="Homepage Widgets Management"
+                    res_model="res.widget.wizard" src_model="res.widget.user"
+                    view_mode="form" target="new" key2="client_action_multi"
+                    id="action_res_widget_wizard"/>
     </data>
 </openerp>

From eb3f4bdb25ba6a166b7b3d5ae85f432de4942337 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 25 Nov 2010 13:48:34 +0100
Subject: [PATCH 8/8] [FIX] res_widget: use context correctly

bzr revid: xmo@openerp.com-20101125124834-daf5p22of6r9unvc
---
 bin/addons/base/res/res_widget.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/bin/addons/base/res/res_widget.py b/bin/addons/base/res/res_widget.py
index b917ea9e24e..1d9a688655e 100644
--- a/bin/addons/base/res/res_widget.py
+++ b/bin/addons/base/res/res_widget.py
@@ -43,14 +43,15 @@ class res_widget_wizard(osv.osv_memory):
     _name = "res.widget.wizard"
     _description = "Add a widget for User"
     _columns = {
-        'widget_id': fields.many2many("res.widget", "res_widget_user_rel", "uid", "wid", "Widget"),
+        'widget_id': fields.many2many("res.widget",
+                                      "res_widget_user_rel", "uid", "wid",
+                                      "Widget"),
     }
-    
+
     def res_widget_add(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
-        wizard = self.read(cr, uid, ids)[0]
+        wizard = self.read(cr, uid, ids, context=context)[0]
         for wiz_id in wizard['widget_id']:
-            self.pool.get('res.widget.user').create(cr, uid, {'user_id':uid, 'widget_id':wiz_id})
+            self.pool.get('res.widget.user').create(
+                cr, uid, {'user_id':uid, 'widget_id':wiz_id}, context=context)
         return {'type': 'ir.actions.act_window_close'}
 res_widget_wizard()