From 2b644cce5e1640aec932efed67961c67b26d1bc8 Mon Sep 17 00:00:00 2001 From: "vda (Open ERP)" Date: Tue, 5 Oct 2010 11:45:56 +0530 Subject: [PATCH 1/7] [IMP] Twitter widget for openerp web. bzr revid: vda@tinyerp.com-20101005061556-sotgy22ty52xc2n8 --- bin/addons/base/__openerp__.py | 5 ++- bin/addons/base/res/__init__.py | 1 + bin/addons/base/res/res_widget.py | 30 ++++++++++++++ bin/addons/base/res/res_widget_data.xml | 42 ++++++++++++++++++++ bin/addons/base/res/res_widget_view.xml | 37 +++++++++++++++++ bin/addons/base/security/ir.model.access.csv | 1 + 6 files changed, 114 insertions(+), 2 deletions(-) create mode 100644 bin/addons/base/res/res_widget.py create mode 100644 bin/addons/base/res/res_widget_data.xml create mode 100644 bin/addons/base/res/res_widget_view.xml diff --git a/bin/addons/base/__openerp__.py b/bin/addons/base/__openerp__.py index 86a0229358a..2bf126f5300 100644 --- a/bin/addons/base/__openerp__.py +++ b/bin/addons/base/__openerp__.py @@ -73,13 +73,14 @@ 'security/base_security.xml', 'maintenance/maintenance_view.xml', - 'security/ir.model.access.csv' - + 'security/ir.model.access.csv', + 'res/res_widget_view.xml', ], 'demo_xml': [ 'base_demo.xml', 'res/partner/partner_demo.xml', 'res/partner/crm_demo.xml', + 'res/res_widget_data.xml', ], 'test': [ 'test/base_test.xml', diff --git a/bin/addons/base/res/__init__.py b/bin/addons/base/res/__init__.py index b7a14c78a93..1536f8b2d75 100644 --- a/bin/addons/base/res/__init__.py +++ b/bin/addons/base/res/__init__.py @@ -33,4 +33,5 @@ import res_request import res_lang import res_log import ir_property +import res_widget diff --git a/bin/addons/base/res/res_widget.py b/bin/addons/base/res/res_widget.py new file mode 100644 index 00000000000..d59975b5e8a --- /dev/null +++ b/bin/addons/base/res/res_widget.py @@ -0,0 +1,30 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2009 Tiny SPRL (). +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## + +from osv import fields,osv + +class openerp_feedback(osv.osv): + _name = "twitter.widget" + _columns = { + 'title' : fields.char('Title', size=64,help="ABC"), + 'content': fields.text('Content') + } +openerp_feedback() \ No newline at end of file diff --git a/bin/addons/base/res/res_widget_data.xml b/bin/addons/base/res/res_widget_data.xml new file mode 100644 index 00000000000..eaaf0ff3869 --- /dev/null +++ b/bin/addons/base/res/res_widget_data.xml @@ -0,0 +1,42 @@ + + + + + OpenERP Favorites + +]]> + + + \ No newline at end of file diff --git a/bin/addons/base/res/res_widget_view.xml b/bin/addons/base/res/res_widget_view.xml new file mode 100644 index 00000000000..0002ae08020 --- /dev/null +++ b/bin/addons/base/res/res_widget_view.xml @@ -0,0 +1,37 @@ + + + + + twitter.widget.form + twitter.widget + form + +
+ + + + +
+ + twitter.widget.tree + twitter.widget + tree + + + + + + + + + OpenERP Feedback + twitter.widget + form + + + +
+
diff --git a/bin/addons/base/security/ir.model.access.csv b/bin/addons/base/security/ir.model.access.csv index cbbeb30fa0d..76f525a613c 100644 --- a/bin/addons/base/security/ir.model.access.csv +++ b/bin/addons/base/security/ir.model.access.csv @@ -120,3 +120,4 @@ "access_ir_filter employee","ir_filters employee","model_ir_filters","group_user",1,1,1,1 "access_ir_filters","ir_filters_all","model_ir_filters",,1,1,1,1 "access_res_partner_address","res.partner.address","model_res_partner_address","group_system",1,1,1,1 +"access_res_widget","res.widget","model_twitter_widget","group_erp_manager",1,1,1,1 From 5edaa42c3f889bae8770428b679d057aacfa5a9e Mon Sep 17 00:00:00 2001 From: "vda (Open ERP)" Date: Tue, 5 Oct 2010 14:57:02 +0530 Subject: [PATCH 2/7] [FIX] Fixes users right, model name. bzr revid: vda@tinyerp.com-20101005092702-28d10t9idqvk0kcw --- bin/addons/base/res/res_widget.py | 6 ++-- bin/addons/base/res/res_widget_data.xml | 2 +- bin/addons/base/res/res_widget_view.xml | 32 +++++++++++--------- bin/addons/base/security/base_security.xml | 4 +++ bin/addons/base/security/ir.model.access.csv | 4 ++- 5 files changed, 28 insertions(+), 20 deletions(-) diff --git a/bin/addons/base/res/res_widget.py b/bin/addons/base/res/res_widget.py index d59975b5e8a..2cddaa73ca8 100644 --- a/bin/addons/base/res/res_widget.py +++ b/bin/addons/base/res/res_widget.py @@ -21,10 +21,10 @@ from osv import fields,osv -class openerp_feedback(osv.osv): - _name = "twitter.widget" +class res_widget(osv.osv): + _name = "res.widget" _columns = { 'title' : fields.char('Title', size=64,help="ABC"), 'content': fields.text('Content') } -openerp_feedback() \ No newline at end of file +res_widget() \ No newline at end of file diff --git a/bin/addons/base/res/res_widget_data.xml b/bin/addons/base/res/res_widget_data.xml index eaaf0ff3869..b4e110b21cc 100644 --- a/bin/addons/base/res/res_widget_data.xml +++ b/bin/addons/base/res/res_widget_data.xml @@ -1,7 +1,7 @@ - + OpenERP Favorites diff --git a/bin/addons/base/res/res_widget_view.xml b/bin/addons/base/res/res_widget_view.xml index 0002ae08020..690d456691c 100644 --- a/bin/addons/base/res/res_widget_view.xml +++ b/bin/addons/base/res/res_widget_view.xml @@ -1,37 +1,39 @@ - - twitter.widget.form - twitter.widget + + res.widget.form + res.widget form -
+
- - twitter.widget.tree - twitter.widget + + res.widget.tree + res.widget tree - + - - OpenERP Feedback - twitter.widget + + OpenERP Favourites + res.widget form - + + + action="res_widget_act_window" + id="menu_res_widget_act_window" + parent="base.menu_users" + />
diff --git a/bin/addons/base/security/base_security.xml b/bin/addons/base/security/base_security.xml index d7d39ea27e9..016204e7241 100644 --- a/bin/addons/base/security/base_security.xml +++ b/bin/addons/base/security/base_security.xml @@ -8,6 +8,10 @@ Administration / Configuration + + Administration / Access Rights diff --git a/bin/addons/base/security/ir.model.access.csv b/bin/addons/base/security/ir.model.access.csv index 76f525a613c..a8144a44834 100644 --- a/bin/addons/base/security/ir.model.access.csv +++ b/bin/addons/base/security/ir.model.access.csv @@ -120,4 +120,6 @@ "access_ir_filter employee","ir_filters employee","model_ir_filters","group_user",1,1,1,1 "access_ir_filters","ir_filters_all","model_ir_filters",,1,1,1,1 "access_res_partner_address","res.partner.address","model_res_partner_address","group_system",1,1,1,1 -"access_res_widget","res.widget","model_twitter_widget","group_erp_manager",1,1,1,1 +"access_res_widget","res.widget","model_res_widget","group_erp_manager",1,1,1,1 +"access_res_widget_user","res.widget.user","model_res_widget",,1,0,0,0 + From ceedb2fc81a3131a9c27ace460c52dfe106476f9 Mon Sep 17 00:00:00 2001 From: "vda (Open ERP)" Date: Tue, 5 Oct 2010 15:03:01 +0530 Subject: [PATCH 3/7] [FIX] Remove unnecessary code. bzr revid: vda@tinyerp.com-20101005093301-4t0dzqhivdmqwng1 --- 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 2cddaa73ca8..80706084df1 100644 --- a/bin/addons/base/res/res_widget.py +++ b/bin/addons/base/res/res_widget.py @@ -24,7 +24,7 @@ from osv import fields,osv class res_widget(osv.osv): _name = "res.widget" _columns = { - 'title' : fields.char('Title', size=64,help="ABC"), + 'title' : fields.char('Title', size=64), 'content': fields.text('Content') } res_widget() \ No newline at end of file From c76794e0bb40ff998559830cfb8ea17580787218 Mon Sep 17 00:00:00 2001 From: "vda (Open ERP)" Date: Tue, 5 Oct 2010 15:36:06 +0530 Subject: [PATCH 4/7] [FIX] Link colors according to OpenERP web links. bzr revid: vda@tinyerp.com-20101005100606-1o1rrm9heb2eg7qe --- bin/addons/base/res/res_widget_data.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/addons/base/res/res_widget_data.xml b/bin/addons/base/res/res_widget_data.xml index b4e110b21cc..4ee85646b04 100644 --- a/bin/addons/base/res/res_widget_data.xml +++ b/bin/addons/base/res/res_widget_data.xml @@ -23,7 +23,7 @@ new TWTR.Widget({ tweets: { background: '#F0EEEE', color: '#444444', - links: '#43c43f' + links: '#9A0404' } }, features: { From 489e6ded3924658d9c8d3dfe2e79c040931a464a Mon Sep 17 00:00:00 2001 From: "vda (Open ERP)" Date: Tue, 5 Oct 2010 16:47:53 +0530 Subject: [PATCH 5/7] [FIX] Removed unnecessary commented code. bzr revid: vda@tinyerp.com-20101005111753-s54kt87wf1uflmzn --- bin/addons/base/security/base_security.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/bin/addons/base/security/base_security.xml b/bin/addons/base/security/base_security.xml index 016204e7241..d7d39ea27e9 100644 --- a/bin/addons/base/security/base_security.xml +++ b/bin/addons/base/security/base_security.xml @@ -8,10 +8,6 @@ Administration / Configuration - - Administration / Access Rights From c14910003c28fa892a724396eb140a7ba8680028 Mon Sep 17 00:00:00 2001 From: "vda (Open ERP)" Date: Wed, 6 Oct 2010 19:13:29 +0530 Subject: [PATCH 6/7] [Fix] Add Search view, Fixes for views. bzr revid: vda@tinyerp.com-20101006134329-bb9xbojglh0zqbth --- bin/addons/base/res/res_widget.py | 1 + bin/addons/base/res/res_widget_view.xml | 20 ++++++++++++++++---- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/bin/addons/base/res/res_widget.py b/bin/addons/base/res/res_widget.py index 80706084df1..978a092c5db 100644 --- a/bin/addons/base/res/res_widget.py +++ b/bin/addons/base/res/res_widget.py @@ -23,6 +23,7 @@ from osv import fields,osv class res_widget(osv.osv): _name = "res.widget" + _rec_name = "title" _columns = { 'title' : fields.char('Title', size=64), 'content': fields.text('Content') diff --git a/bin/addons/base/res/res_widget_view.xml b/bin/addons/base/res/res_widget_view.xml index 690d456691c..69c801e14a7 100644 --- a/bin/addons/base/res/res_widget_view.xml +++ b/bin/addons/base/res/res_widget_view.xml @@ -1,12 +1,23 @@ + + res.widget.search + res.widget + search + + + + + + + res.widget.form res.widget form -
+ @@ -17,17 +28,18 @@ res.widget tree - +
- OpenERP Favourites + Widgets res.widget form - + tree,form + Date: Thu, 7 Oct 2010 14:33:34 +0530 Subject: [PATCH 7/7] [FIX] Fix parent view and scrollabe widget. bzr revid: vda@tinyerp.com-20101007090334-jy9q574yo1gxg5ir --- bin/addons/base/res/res_widget_data.xml | 2 +- bin/addons/base/res/res_widget_view.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/addons/base/res/res_widget_data.xml b/bin/addons/base/res/res_widget_data.xml index 4ee85646b04..b0648b9ce32 100644 --- a/bin/addons/base/res/res_widget_data.xml +++ b/bin/addons/base/res/res_widget_data.xml @@ -27,7 +27,7 @@ new TWTR.Widget({ } }, features: { - scrollbar: false, + scrollbar: true, loop: false, live: true, hashtags: true, diff --git a/bin/addons/base/res/res_widget_view.xml b/bin/addons/base/res/res_widget_view.xml index 69c801e14a7..7164c504993 100644 --- a/bin/addons/base/res/res_widget_view.xml +++ b/bin/addons/base/res/res_widget_view.xml @@ -45,7 +45,7 @@