Merge lp:~registry/openobject-server/report-server-apa into lp:openobject-server

[Ajay Patel (OpenERP)]

[IMP]:base:for widgets
http://pad.openerp.com/widgets-homepage

[Harry (OpenERP) (hmo-tinyerp)]

Hello amit,

when I add new widget for 'note, 'currency_converter', etc,

It could not display well in homepage.

can you find out problem and correct ?

and also user should not able to add same widget repeatedly

Thanks

review: Needs Fixing

[Ajay Patel (OpenERP) (ajay-openerp)]

Hello

It due to the web client. when we add the widget then load the page once again for correctly display it.

Thanks,
apa

review: Needs Resubmitting

=== modified file 'bin/addons/base/res/res_widget.py'
--- bin/addons/base/res/res_widget.py	2010-12-14 10:07:06 +0000
+++ bin/addons/base/res/res_widget.py	2010-12-24 05:21:27 +0000
@@ -52,14 +52,23 @@
 
 res_widget_user()
 
-
 class res_widget_wizard(osv.osv_memory):
     _name = "res.widget.wizard"
     _description = "Add a widget for User"
+    
+    def widgets_list_get(self, cr, uid,context=None):
+        widget_obj=self.pool.get('res.widget')
+        ids=widget_obj.search(cr, uid,[],context=context)
+        if not len(ids):
+            return []
+        reads = widget_obj.read(cr, uid, ids, ['title'], context=context)
+        res = []
+        for record in reads:
+            res.append((record['id'], record['title']))
+        return res
+
     _columns = {
-        'widget_id': fields.many2many("res.widget",
-                                      "res_widget_user_rel", "uid", "wid",
-                                      "Widget"),
+        'widgets_list': fields.selection(widgets_list_get,string='Widget',required=True),
     }
 
     def action_get(self, cr, uid, context=None):
@@ -67,10 +76,10 @@
             cr, uid, 'base', 'action_res_widget_wizard', context=context)
 
     def res_widget_add(self, cr, uid, ids, context=None):
-        wizard = self.read(cr, uid, ids, context=context)[0]
-        for wiz_id in wizard['widget_id']:
+        widget_id = self.read(cr, uid, ids, context=context)[0]
+        if widget_id.has_key('widgets_list') and widget_id['widgets_list']:
             self.pool.get('res.widget.user').create(
-                cr, uid, {'user_id':uid, 'widget_id':wiz_id}, context=context)
+                cr, uid, {'user_id':uid, 'widget_id':widget_id['widgets_list']}, context=context)
         return {'type': 'ir.actions.act_window_close'}
 
 res_widget_wizard()

=== modified file 'bin/addons/base/res/res_widget_data.xml'
--- bin/addons/base/res/res_widget_data.xml	2010-11-25 11:09:00 +0000
+++ bin/addons/base/res/res_widget_data.xml	2010-12-24 05:21:27 +0000
@@ -39,189 +39,34 @@
 </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 id="events_widget" model="res.widget">
+      <field name="title">Events</field>
+      <field name="content"><![CDATA[<script src="http://widgets.twimg.com/j/2/widget.js"></script>
+<div style="width:195px; text-align:center;" ><iframe  src="http://www.eventbrite.com/calendar-widget?eid=852573069" frameborder="0" height="406" width="220" marginheight="0" marginwidth="0" scrolling="no" ></iframe><div style="font-family:Helvetica, Arial; font-size:10px; padding:5px 0 5px; margin:2px; width:195px; text-align:center;" ><a style="color:#ddd; text-decoration:none;" target="_blank" href="http://www.eventbrite.com/features?ref=ecal" >Online Ticketing</a><span style="color:#ddd;" > powered by </span><a style="color:#ddd; text-decoration:none;" target="_blank" href="http://www.eventbrite.com?ref=ecal" >Eventbrite</a></div>]]></field>
+    </record>
+
+    <record id="facebook_widget" model="res.widget">
+      <field name="title">Facebook</field>
+      <field name="content"><![CDATA[<script src="http://widgets.twimg.com/j/2/widget.js"></script>
+        <iframe src="http://www.facebook.com/plugins/activity.php?site=www.facebook.com%2FOpenERP&amp;width=300&amp;height=300&amp;header=true&amp;colorscheme=light&amp;recommendations=true" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:300px; height:300px;" allowTransparency="true"></iframe>]]></field>
+    </record>
+
+    <record id="note_widget" model="res.widget">
+      <field name="title">Notes</field>
+      <field name="content"><![CDATA[<script src="http://widgets.twimg.com/j/2/widget.js"></script>
+                 <script src="http://www.gmodules.com/ig/ifr?url=http://www.google.com/ig/modules/sticky.xml&amp;up_title=Note&amp;up_bgcolor=white&amp;up_textcolor=Black&amp;up_stickydata=&amp;synd=open&amp;w=320&amp;h=200&amp;title=Notes&amp;lang=all&amp;country=ALL&amp;border=%23ffffff%7C3px%2C1px+solid+%23999999&amp;output=js"></script>]]></field>
+    </record>
+
+    <record id="google_maps_widget" model="res.widget">
+      <field name="title">Google Maps</field>
+      <field name="content"><![CDATA[<script src="http://widgets.twimg.com/j/2/widget.js"></script>
+                     <script src="http://www.gmodules.com/ig/ifr?url=http://www.google.com/uds/modules/elements/localsearch/localsearch.xml&amp;up_location=Ramillies&amp;up_largeMapMode=1&amp;up_kml=1&amp;up_traffic=&amp;up_locationCacheString=&amp;up_locationCacheLat=&amp;up_locationCacheLng=&amp;up_mapType=m&amp;up_idleZoom=11&amp;up_transitionQuery=&amp;up_rawquery=&amp;up_selectedtext=&amp;synd=open&amp;w=320&amp;h=350&amp;title=Map&amp;lang=all&amp;country=ALL&amp;border=%23ffffff%7C3px%2C1px+solid+%23999999&amp;output=js"></script>]]></field>
+    </record>
+
+    <record id="currency_converter_widget" model="res.widget">
+      <field name="title">Currency Converter</field>
+      <field name="content"><![CDATA[<script src="http://widgets.twimg.com/j/2/widget.js"></script>
+                         <script src="http://www.gmodules.com/ig/ifr?url=http://www.pixelmedia.nl/gmodules/ucc.xml&amp;up_fromcur=USD&amp;up_tocur=EUR&amp;synd=open&amp;w=320&amp;h=110&amp;title=Currency+Converter&amp;lang=all&amp;country=ALL&amp;border=%23ffffff%7C3px%2C1px+solid+%23999999&amp;output=js"></script>]]></field>
     </record>
 
     <record id="openerp_favorites" model="res.widget.user">

=== modified file 'bin/addons/base/res/res_widget_demo.xml'
--- bin/addons/base/res/res_widget_demo.xml	2010-11-25 11:09:00 +0000
+++ bin/addons/base/res/res_widget_demo.xml	2010-12-24 05:21:27 +0000
@@ -1,12 +1,12 @@
 <?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"/>
+    <record id="events_admin_widgets" model="res.widget.user">
+        <field name="widget_id" ref="events_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"/>
+    <record id="events_demo_widgets" model="res.widget.user">
+        <field name="widget_id" ref="events_widget"/>
         <field name="user_id" ref="base.user_demo"/>
     </record>
   </data>

=== modified file 'bin/addons/base/res/res_widget_view.xml'
--- bin/addons/base/res/res_widget_view.xml	2010-11-25 12:48:11 +0000
+++ bin/addons/base/res/res_widget_view.xml	2010-12-24 05:21:27 +0000
@@ -81,7 +81,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
               <form string="Widget Wizard" col="4">
-                <field name="widget_id"/>
+                <field name="widgets_list" colspan="4"/>
                 <newline/>
                 <separator string="" colspan="6"/>
                 <group colspan="6" col="4" >

=== modified file 'bin/addons/base/security/ir.model.access.csv'
--- bin/addons/base/security/ir.model.access.csv	2010-11-26 14:04:37 +0000
+++ bin/addons/base/security/ir.model.access.csv	2010-12-24 05:21:27 +0000
@@ -1,5 +1,5 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_res_widget_user_all","res_widget_user all","model_res_widget_user",,1,0,0,0
+"access_res_widget_user_all","res_widget_user all","model_res_widget_user",,1,1,1,1
 "access_res_widget_user_group_user","res_widget_user group_user","model_res_widget_user","group_user",1,1,1,1
 "access_ir_attachment_all","ir_attachment all","model_ir_attachment",,1,0,0,0
 "access_ir_attachment_group_user","ir_attachment group_user","model_ir_attachment","group_user",1,1,1,1