Merge lp:~openerp/openobject-server/web-dashboard into lp:openobject-server

[Vaibhav Darji]

Implemented Web dashboard.
Added sample image for Administration.

[lp:~openerp/openobject-server/web-dashboard]

3032. By Vaibhav Darji on 2010-11-20

[REM] Removed unnecessary code.

[Navrang Oza (noz-tiny)]

@xmo,

From web client side, I have checked its working fine by applying web and server branch.
But for server side approval waiting.

[Xavier (Open ERP) (xmo-deactivatedaccount)]

Small issue: the handling of the web_icon and the web_icon_hover seem mostly independent, but what happens if we have a web_icon_hover and no web_icon?

review: Needs Information

[Navrang Oza (noz-tiny)]

> Small issue: the handling of the web_icon and the web_icon_hover seem mostly
> independent, but what happens if we have a web_icon_hover and no web_icon?
It is possible for reverse case also.

I think we can go for, If any one icon is available instead of two then both the times (hover and normal) same icon will be there.

possible ?

[Xavier (Open ERP) (xmo-deactivatedaccount)]

Also in the first section of the bin/addons/base/ir/ir_ui_menu.py code, why `res[menu.id].update({'web_icon_hover_datas': icon_hover,})`?

* Why call update rather than __setitem__
* Why provide a dict rather than use kwargs?

All in all, why not just use `res[menu.id]['web_icon_hover_datas'] = icon_hover`

review: Needs Fixing

[Xavier (Open ERP) (xmo-deactivatedaccount)]

Also, we should provide pre-set images, currently if I use this branch I don't have any images left on my home screen, which looks kinda weird.

review: Needs Fixing

[lp:~openerp/openobject-server/web-dashboard]

3033. By Vaibhav Darji on 2010-11-22

[FIX] Code improvements.

[Navrang Oza (noz-tiny)]

> Also, we should provide pre-set images, currently if I use this branch I don't
> have any images left on my home screen, which looks kinda weird.

Can we set static image like "No image available" ?
Changes have been committed to the branch as you said.

Thanks for review.

[Xavier (Open ERP) (xmo-deactivatedaccount)]

> I think we can go for, If any one icon is available instead of two then both the times (hover and normal) same icon will be there.

Sure, so if only one image is present we use it for both situations (or we use it for regular and disable hover, that works as well)

> Can we set static image like "No image available" ?

Nah I meant set them on existing menuitem objects and stuff, currently they live in CSS but that was removed (as it was broken with i18n), so cleanup CSS and set images in modules and stuff. Because currently if you create new db with trunk (even using/merging this branch) the home page is completely empty of pictures whereas before there were lots of nice pictures.

[lp:~openerp/openobject-server/web-dashboard]

3034. By Vaibhav Darji on 2010-11-23

[FIX] Add web icon for sale.

[Olivier Dony (Odoo) (odo-openerp)]

Some additional feedback:

- why are you using type='char' for the *.datas fields - these should be binary fields, right? Have you ensured to be compatible with the current fields.binary implementation that allows reading size instead of content of binary fields. We don't want GTK to be reading these, do we?
- please rename the *datas field - data is already a plural form - "datas" does not exist (yes I know we have many typos like that already.. so let's not introduce more!)
- why do you do the resolution of the "web_icon*" paths during menu creation in convert.py? What if I want to move my addons after installing the module? Please do it in the function fields.
- final note: if these values are accessed often, you would do good to make the function fields "stored", so the icons can be cached (user can simply save the menu again to refresh it) And when you do that, you really need to make them type='binary' and conform to the binary logic

Thanks!

review: Needs Fixing

[Harry (OpenERP) (hmo-tinyerp)]

Hello All!

sorry I'm rejected this merge proposal. but You can Review this merge proposal for this feature : https://code.launchpad.net/~openerp-dev/openobject-server/gpa-server-framework/+merge/41707

Thanks

Unmerged revisions

3034. By Vaibhav Darji on 2010-11-23

[FIX] Add web icon for sale.

3033. By Vaibhav Darji on 2010-11-22

[FIX] Code improvements.

3032. By Vaibhav Darji on 2010-11-20

[REM] Removed unnecessary code.

3031. By Vaibhav Darji on 2010-11-20

[ADD] Web dashboard.

=== modified file 'bin/addons/base/base_menu.xml'
--- bin/addons/base/base_menu.xml	2010-10-17 19:02:08 +0000
+++ bin/addons/base/base_menu.xml	2010-11-23 11:42:13 +0000
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem icon="terp-administration" id="menu_administration" name="Administration" sequence="50"/>
-
+        <menuitem icon="terp-administration" id="menu_administration" name="Administration" sequence="50" web_icon="image/admin.png" web_icon_hover="image/admin_hover.png"/>
         <menuitem icon="terp-administration" id="menu_administration_shortcut" parent="menu_administration" name="Custom Shortcuts" sequence="50"/>
         <menuitem id="next_id_4" name="Low Level Objects"
             parent="base.menu_administration" sequence="3"
@@ -22,9 +21,7 @@
             groups="base.group_extended"/>
         <menuitem id="menu_management" name="Modules" parent="base.menu_administration" sequence="10"
             groups="base.group_extended"/>
-        <menuitem id="reporting_menu"
-            parent="base.menu_custom" name="Reporting" sequence="30"
-             />
+        <menuitem id="reporting_menu" parent="base.menu_custom" name="Reporting" sequence="30"/>
 
         <menuitem id="base.menu_reporting" name="Reporting" parent="base.menu_administration" sequence="11"
             groups="base.group_extended"/>

=== added directory 'bin/addons/base/image'
=== added file 'bin/addons/base/image/admin.png'
Binary files bin/addons/base/image/admin.png	1970-01-01 00:00:00 +0000 and bin/addons/base/image/admin.png	2010-11-23 11:42:13 +0000 differ
=== added file 'bin/addons/base/image/admin_hover.png'
Binary files bin/addons/base/image/admin_hover.png	1970-01-01 00:00:00 +0000 and bin/addons/base/image/admin_hover.png	2010-11-23 11:42:13 +0000 differ
=== added file 'bin/addons/base/image/sale.png'
Binary files bin/addons/base/image/sale.png	1970-01-01 00:00:00 +0000 and bin/addons/base/image/sale.png	2010-11-23 11:42:13 +0000 differ
=== added file 'bin/addons/base/image/sale_hover.png'
Binary files bin/addons/base/image/sale_hover.png	1970-01-01 00:00:00 +0000 and bin/addons/base/image/sale_hover.png	2010-11-23 11:42:13 +0000 differ
=== modified file 'bin/addons/base/ir/ir.xml'
--- bin/addons/base/ir/ir.xml	2010-11-12 11:08:42 +0000
+++ bin/addons/base/ir/ir.xml	2010-11-23 11:42:13 +0000
@@ -1379,6 +1379,12 @@
                         <field name="action" colspan="4" />
                         <field name="icon" on_change="onchange_icon(icon)" colspan="2"/>
                         <field name="icon_pict" widget="picture" nolabel="1" colspan="2"/>
+                        <group col="4" colspan="8">
+                            <field name="web_icon" groups="base.group_extended"  />
+                            <field name="web_icon_hover" groups="base.group_extended" />
+                            <field name="web_icon_datas" widget="picture" groups="base.group_extended"/>
+                            <field name="web_icon_hover_datas" widget="picture" groups="base.group_extended"/>
+                        </group>
                     </group>
                     <notebook colspan="4">
                         <page string="Groups">

=== modified file 'bin/addons/base/ir/ir_ui_menu.py'
--- bin/addons/base/ir/ir_ui_menu.py	2010-10-17 04:53:44 +0000
+++ bin/addons/base/ir/ir_ui_menu.py	2010-11-23 11:42:13 +0000
@@ -22,6 +22,7 @@
 from osv import fields, osv
 import re
 import tools
+import base64
 
 def one_in(setA, setB):
     """Check the presence of an element of setA in setB
@@ -260,8 +261,27 @@
                 return False
             level -= 1
         return True
-    
-    
+
+    def _get_image_icon(self, cr, uid, ids, name, args, context=None):
+        res = {}
+        for menu in self.browse(cr, uid, ids, context=context):
+            res[menu.id] = {
+                'web_icon_datas': False,
+                'web_icon_hover_datas': False,
+            }
+            if not menu.parent_id:
+                if menu.web_icon_hover:
+                    fp_icon_hover = file(menu.web_icon_hover,'r')
+                    file_data_icon_hover = fp_icon_hover.read()
+                    icon_hover = base64.encodestring(file_data_icon_hover)
+                    res[menu.id]['web_icon_hover_datas'] = icon_hover
+                if menu.web_icon:
+                    fp_icon = file(menu.web_icon,'r')
+                    file_data_icon = fp_icon.read()
+                    icon = base64.encodestring(file_data_icon)
+                    res[menu.id]['web_icon_datas'] = icon
+        return res
+
 
     _columns = {
         'name': fields.char('Menu', size=64, required=True, translate=True),
@@ -275,6 +295,10 @@
             string='Complete Name', type='char', size=128),
         'icon': fields.selection(tools.icons, 'Icon', size=64),
         'icon_pict': fields.function(_get_icon_pict, method=True, type='char', size=32),
+        'web_icon': fields.char('Icon File', size=128),
+        'web_icon_hover':fields.char('Icon hover File', size=128),
+        'web_icon_datas': fields.function(_get_image_icon, method=True, string='Web Icons', type='char', readonly=True, multi='icon'),
+        'web_icon_hover_datas':fields.function(_get_image_icon, method=True, type='char', string='Web Icons Hover', readonly=True, multi='icon'),
         'action': fields.function(_action, fnct_inv=_action_inv,
             method=True, type='reference', string='Action',
             selection=[

=== modified file 'bin/addons/base/res/partner/partner_view.xml'
--- bin/addons/base/res/partner/partner_view.xml	2010-10-17 12:17:42 +0000
+++ bin/addons/base/res/partner/partner_view.xml	2010-11-23 11:42:13 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem icon="terp-partner" id="menu_base_partner" name="Sales" sequence="0"/>
+        <menuitem icon="terp-partner" id="menu_base_partner" name="Sales" sequence="0" web_icon="addons/base/image/sale.png" web_icon_hover="addons/base/image/sale_hover.png"/>
 
         <menuitem id="menu_address_book" name="Address Book" parent="menu_base_partner" sequence="2"/>
 

=== modified file 'bin/import_xml.rng'
--- bin/import_xml.rng	2010-10-08 14:23:01 +0000
+++ bin/import_xml.rng	2010-11-23 11:42:13 +0000
@@ -176,6 +176,8 @@
             <rng:optional> <rng:attribute name="name"/></rng:optional>
             <rng:optional> <rng:attribute name="parent"/> </rng:optional>
             <rng:optional> <rng:attribute name="icon"/> </rng:optional>
+            <rng:optional> <rng:attribute name="web_icon"/> </rng:optional>
+            <rng:optional> <rng:attribute name="web_icon_hover"/> </rng:optional>
             <rng:optional> <rng:attribute name="action"/> </rng:optional>
             <rng:optional> <rng:attribute name="string"/> </rng:optional>
             <rng:optional> <rng:attribute name="sequence"/> </rng:optional>

=== modified file 'bin/tools/convert.py'
--- bin/tools/convert.py	2010-11-16 21:53:59 +0000
+++ bin/tools/convert.py	2010-11-23 11:42:13 +0000
@@ -25,7 +25,7 @@
 import os.path
 import pickle
 import re
-
+import addons
 # for eval context:
 import time
 import release
@@ -284,7 +284,7 @@
         d_search = rec.get("search",'').encode('utf-8')
         d_id = rec.get("id",'')
         ids = []
-        
+
         if d_search:
             idref = _get_idref(self, cr, self.uid, d_model, context={}, idref={})
             ids = self.pool.get(d_model).search(cr, self.uid, unsafe_eval(d_search, idref))
@@ -556,7 +556,7 @@
 
         values = {'parent_id': False}
         if rec.get('parent', False) is False and len(m_l) > 1:
-            # No parent attribute specified and the menu name has several menu components, 
+            # No parent attribute specified and the menu name has several menu components,
             # try to determine the ID of the parent according to menu path
             pid = False
             res = None
@@ -638,6 +638,11 @@
         if rec.get('icon'):
             values['icon'] = str(rec.get('icon'))
 
+        if rec.get('web_icon'):
+            values['web_icon'] = addons.get_module_resource(self.module,str(rec.get('web_icon')))
+        if rec.get('web_icon_hover'):
+            values['web_icon_hover'] = addons.get_module_resource(self.module,str(rec.get('web_icon_hover')))
+
         if rec.get('groups'):
             g_names = rec.get('groups','').split(',')
             groups_value = []