diff --git a/openerp/addons/base/__openerp__.py b/openerp/addons/base/__openerp__.py index d4e7098c282..1f2caadc54e 100644 --- a/openerp/addons/base/__openerp__.py +++ b/openerp/addons/base/__openerp__.py @@ -86,14 +86,11 @@ The kernel of OpenERP, needed for all installation. 'security/base_security.xml', 'security/ir.model.access.csv', 'security/ir.model.access-1.csv', # res.partner.address is deprecated; it is still there for backward compability only and will be removed in next version - 'res/res_widget_view.xml', - 'res/res_widget_data.xml', ], 'demo': [ 'base_demo.xml', 'res/res_partner_demo.xml', 'res/res_partner_demo.yml', - 'res/res_widget_demo.xml', ], 'test': [ 'test/base_test.xml', diff --git a/openerp/addons/base/module/module_view.xml b/openerp/addons/base/module/module_view.xml index e825451674b..1ec76ec0988 100644 --- a/openerp/addons/base/module/module_view.xml +++ b/openerp/addons/base/module/module_view.xml @@ -172,6 +172,7 @@ + diff --git a/openerp/addons/base/module/wizard/base_module_upgrade.py b/openerp/addons/base/module/wizard/base_module_upgrade.py index 04b7e785e48..bd6b9b7640d 100644 --- a/openerp/addons/base/module/wizard/base_module_upgrade.py +++ b/openerp/addons/base/module/wizard/base_module_upgrade.py @@ -46,12 +46,12 @@ class base_module_upgrade(osv.osv_memory): ids = self.get_module_list(cr, uid, context=context) if not ids: - res['arch'] = '''
-
-
- + res['arch'] = ''' + +
+
''' return res diff --git a/openerp/addons/base/res/__init__.py b/openerp/addons/base/res/__init__.py index 10bd4e89abd..e8adecc1d1a 100644 --- a/openerp/addons/base/res/__init__.py +++ b/openerp/addons/base/res/__init__.py @@ -31,7 +31,6 @@ import res_company import res_users import res_request import res_lang -import res_widget import ir_property import report diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py index 27fb7603c7e..f272b3712c6 100644 --- a/openerp/addons/base/res/res_users.py +++ b/openerp/addons/base/res/res_users.py @@ -122,7 +122,6 @@ class res_users(osv.osv): } _name = "res.users" _description = 'Users' - _order = 'login' def _set_new_password(self, cr, uid, id, name, value, args, context=None): if value is False: diff --git a/openerp/addons/base/res/res_widget.py b/openerp/addons/base/res/res_widget.py deleted file mode 100644 index 2137eab51fd..00000000000 --- a/openerp/addons/base/res/res_widget.py +++ /dev/null @@ -1,89 +0,0 @@ -# -*- 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 res_widget(osv.osv): - _name = "res.widget" - _rec_name = "title" - _columns = { - 'title' : fields.char('Title', size=64, required=True, translate=True), - 'content': fields.text('Content', required=True), - } - -res_widget() - - -class res_widget_user(osv.osv): - _name="res.widget.user" - _rec_name="user_id" - _order = "sequence" - _columns = { - 'sequence': fields.integer('Sequence'), - 'user_id': fields.many2one('res.users','User', select=1, ondelete='cascade'), - 'widget_id': fields.many2one('res.widget','Widget',required=True, ondelete='cascade'), - } - - def create(self, cr, uid, vals, context=None): - existing = self.search(cr, uid, [('user_id', '=', vals.get('user_id')), ('widget_id', '=', vals.get('widget_id'))], context=context) - if existing: - res = existing[0] - else: - res = super(res_widget_user, self).create(cr, uid, vals, context=context) - return res - -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 = { - 'widgets_list': fields.selection(widgets_list_get,string='Widget',required=True), - } - - def action_get(self, cr, uid, context=None): - return self.pool.get('ir.actions.act_window').for_xml_id( - cr, uid, 'base', 'action_res_widget_wizard', context=context) - - def res_widget_add(self, cr, uid, ids, context=None): - 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':widget_id['widgets_list']}, context=context) - return {'type': 'ir.actions.act_window_close'} - -res_widget_wizard() - - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/openerp/addons/base/res/res_widget_data.xml b/openerp/addons/base/res/res_widget_data.xml deleted file mode 100644 index 48d53c7a021..00000000000 --- a/openerp/addons/base/res/res_widget_data.xml +++ /dev/null @@ -1,78 +0,0 @@ - - - - - OpenERP Tweets - -]]> - - - - Events - -
]]> - - - - Facebook - - ]]> - - - - Notes - - ]]> - - - - Google Maps - - ]]> - - - - Currency Converter - - ]]> - - - - - - - diff --git a/openerp/addons/base/res/res_widget_demo.xml b/openerp/addons/base/res/res_widget_demo.xml deleted file mode 100644 index 24e7a133ed9..00000000000 --- a/openerp/addons/base/res/res_widget_demo.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/openerp/addons/base/res/res_widget_view.xml b/openerp/addons/base/res/res_widget_view.xml deleted file mode 100644 index bad582f97db..00000000000 --- a/openerp/addons/base/res/res_widget_view.xml +++ /dev/null @@ -1,101 +0,0 @@ - - - - - res.widget.search - res.widget - - - - - - - - res.widget.form - res.widget - -
- - - - - - -
- - - - res.widget.tree - res.widget - - - - - - - - - Homepage Widgets - res.widget - form - tree,form - - - - - - res.widget.user.tree - res.widget.user - - - - - - - - - - res.widget.user.form - res.widget.user - -
- - - - - - - -
- - - - Widgets per User - res.widget.user - form - tree,form - - - - - Homepage Widgets Management - res.widget.wizard - -
-
-
- - - -
- - - - - diff --git a/openerp/addons/base/security/base_security.xml b/openerp/addons/base/security/base_security.xml index 02323a635df..b0de06078af 100644 --- a/openerp/addons/base/security/base_security.xml +++ b/openerp/addons/base/security/base_security.xml @@ -46,12 +46,6 @@ - - res.widget.user rule - - ['|', ('user_id','=',user.id),('user_id','=',False)] - - res.partner company diff --git a/openerp/addons/base/security/ir.model.access.csv b/openerp/addons/base/security/ir.model.access.csv index 8e9134ff070..35d5b82bc41 100644 --- a/openerp/addons/base/security/ir.model.access.csv +++ b/openerp/addons/base/security/ir.model.access.csv @@ -1,6 +1,4 @@ "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,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 "access_ir_cron_group_cron","ir_cron group_cron","model_ir_cron","group_system",1,1,1,1 @@ -115,8 +113,6 @@ "access_ir_filter all","ir_filters all","model_ir_filters",,1,0,0,0 "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_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 "access_ir_config_parameter","ir_config_parameter","model_ir_config_parameter",,1,0,0,0 "access_ir_mail_server_all","ir_mail_server","model_ir_mail_server",,1,0,0,0 "access_ir_actions_client","ir_actions_client all","model_ir_actions_client",,1,0,0,0