Pinakin Nayi (OpenERP) has proposed merging
lp:~openerp-dev/openobject-server/trunk-addons18-settings-bde-imp-pna into
lp:~openerp-dev/openobject-server/trunk-addons18-settings-bde.
Requested reviews:
Bharat Devnani (Open ERP) (bde-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-addons18-settings-bde-imp-pna/+merge/130731
Hello Sir,
I improved addons18 setting as below.
1. "Settings > Technical > User Interface > Homepage Widgets" and "Settings >
Technical > User Interface > Widgets per User" are removed.
2. Fix : Go to Settings > Modules > Modules and switch to list view. Now select
group by "Category" in search view. Got error.
3. in user's tree view, records are sorted based on the name.
4. buttons in Apply Schedule Upgrade wizard after upgrade completed should be
at bottom as other form. also remove icons on buttons. label "Apply Schedule
Upgrade" should be "Upgrade Completed" when its completed.
Thanks,
pna
--
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-addons18-settings-bde-imp-pna/+merge/130731
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-server/trunk-addons18-settings-bde.
=== modified file 'openerp/addons/base/__openerp__.py'
--- openerp/addons/base/__openerp__.py 2012-10-13 12:09:24 +0000
+++ openerp/addons/base/__openerp__.py 2012-10-22 06:04:19 +0000
@@ -86,14 +86,11 @@
'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',
=== modified file 'openerp/addons/base/module/module_view.xml'
--- openerp/addons/base/module/module_view.xml 2012-10-08 14:27:57 +0000
+++ openerp/addons/base/module/module_view.xml 2012-10-22 06:04:19 +0000
@@ -172,6 +172,7 @@
<field name="author"/>
<field name="installed_version"/>
<field name="state"/>
+ <field name="category_id" invisible="1"/>
</tree>
</field>
</record>
=== modified file 'openerp/addons/base/module/wizard/base_module_upgrade.py'
--- openerp/addons/base/module/wizard/base_module_upgrade.py 2012-10-03 16:16:41 +0000
+++ openerp/addons/base/module/wizard/base_module_upgrade.py 2012-10-22 06:04:19 +0000
@@ -46,12 +46,12 @@
ids = self.get_module_list(cr, uid, context=context)
if not ids:
- res['arch'] = '''<form string="Apply Schedule Upgrade" version="7.0">
- <header>
- <button name="config" string="Start configuration" type="object" icon="gtk-ok"/>
- <button special="cancel" string="Close" icon="gtk-cancel"/>
- </header>
- <separator string="Apply Schedule Upgrade" colspan="4"/>
+ res['arch'] = '''<form string="Upgrade Completed" version="7.0">
+ <footer>
+ <button name="config" string="Start configuration" type="object"/>
+ <button special="cancel" string="Close"/>
+ </footer>
+ <separator string="Upgrade Completed" colspan="4"/>
</form>'''
return res
=== modified file 'openerp/addons/base/res/__init__.py'
--- openerp/addons/base/res/__init__.py 2012-06-04 18:30:55 +0000
+++ openerp/addons/base/res/__init__.py 2012-10-22 06:04:19 +0000
@@ -31,7 +31,6 @@
import res_users
import res_request
import res_lang
-import res_widget
import ir_property
import report
=== modified file 'openerp/addons/base/res/res_users.py'
--- openerp/addons/base/res/res_users.py 2012-10-15 10:01:48 +0000
+++ openerp/addons/base/res/res_users.py 2012-10-22 06:04:19 +0000
@@ -122,7 +122,7 @@
}
_name = "res.users"
_description = 'Users'
- _order = 'login'
+ _order = 'partner_id'
def _set_new_password(self, cr, uid, id, name, value, args, context=None):
if value is False:
=== removed file 'openerp/addons/base/res/res_widget.py'
--- openerp/addons/base/res/res_widget.py 2012-06-22 14:12:22 +0000
+++ openerp/addons/base/res/res_widget.py 1970-01-01 00:00:00 +0000
@@ -1,89 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
-#
-# 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 <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-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:
=== removed file 'openerp/addons/base/res/res_widget_data.xml'
--- openerp/addons/base/res/res_widget_data.xml 2011-10-12 14:48:58 +0000
+++ openerp/addons/base/res/res_widget_data.xml 1970-01-01 00:00:00 +0000
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
- <data>
- <record id="openerp_favorites_twitter_widget" model="res.widget">
- <field name="title">OpenERP Tweets</field>
- <field name="content"><![CDATA[
-<script type="text/javascript" src="http://widgets.twimg.com/j/2/widget.js";></script>
-<script type="text/javascript">
-if (typeof(TWTR) !== 'undefined') {
-new TWTR.Widget({
- version: 2,
- type: 'faves',
- 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: true,
- loop: false,
- live: true,
- hashtags: true,
- timestamp: true,
- avatars: true,
- behavior: 'all'
- }
-}).render().setUser('openerp').start();
-}
-</script>]]> </field>
- </record>
-
- <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="626" 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/OpenERP&width=399&height=300&header=true&colorscheme=light&recommendations=true"; scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:399px; 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&up_title=Note&up_bgcolor=white&up_textcolor=Black&up_stickydata=&synd=open&w=399&h=200&title=Notes&lang=all&country=ALL&border=%23ffffff%7C3px%2C1px+solid+%23999999&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&up_location=Ramillies&up_largeMapMode=1&up_kml=1&up_traffic=&up_locationCacheString=&up_locationCacheLat=&up_locationCacheLng=&up_mapType=m&up_idleZoom=11&up_transitionQuery=&up_rawquery=&up_selectedtext=&synd=open&w=399&h=350&title=Map&lang=all&country=ALL&border=%23ffffff%7C3px%2C1px+solid+%23999999&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&up_fromcur=USD&up_tocur=EUR&synd=open&w=399&h=110&title=Currency+Converter&lang=all&country=ALL&border=%23ffffff%7C3px%2C1px+solid+%23999999&output=js";></script>]]></field>
- </record>
-
- <record id="openerp_favorites" model="res.widget.user">
- <field name="widget_id" ref="openerp_favorites_twitter_widget"/>
- </record>
- </data>
-</openerp>
=== removed file 'openerp/addons/base/res/res_widget_demo.xml'
--- openerp/addons/base/res/res_widget_demo.xml 2011-01-14 15:29:47 +0000
+++ openerp/addons/base/res/res_widget_demo.xml 1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
- <data>
- </data>
-</openerp>
=== removed file 'openerp/addons/base/res/res_widget_view.xml'
--- openerp/addons/base/res/res_widget_view.xml 2012-10-03 16:16:41 +0000
+++ openerp/addons/base/res/res_widget_view.xml 1970-01-01 00:00:00 +0000
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
- <data>
- <record id="view_res_widget_search" model="ir.ui.view">
- <field name="name">res.widget.search</field>
- <field name="model">res.widget</field>
- <field name="arch" type="xml">
- <search string="Search Widget">
- <field name="title" string="Widget"/>
- </search>
- </field>
- </record>
- <record id="res_widget_form" model="ir.ui.view">
- <field name="name">res.widget.form</field>
- <field name="model">res.widget</field>
- <field name="arch" type="xml">
- <form string="Widgets" version="7.0">
- <sheet>
- <group>
- <field name="title"/>
- <field name="content"/>
- </group>
- </sheet>
- </form>
- </field>
- </record>
- <record id="res_widget_tree" model="ir.ui.view">
- <field name="name">res.widget.tree</field>
- <field name="model">res.widget</field>
- <field name="arch" type="xml">
- <tree string="Widgets">
- <field name="title"/>
- </tree>
- </field>
- </record>
-
- <record id="res_widget_act_window" model="ir.actions.act_window">
- <field name="name">Homepage Widgets</field>
- <field name="res_model">res.widget</field>
- <field name="view_type">form</field>
- <field name="view_mode">tree,form</field>
- <field name="search_view_id" ref="view_res_widget_search"/>
- </record>
- <menuitem action="res_widget_act_window" id="menu_res_widget_act_window" parent="base.next_id_2" />
-
- <record id="res_widget_user_tree" model="ir.ui.view">
- <field name="name">res.widget.user.tree</field>
- <field name="model">res.widget.user</field>
- <field name="arch" type="xml">
- <tree string="User Widgets">
- <field name="sequence" invisible="1"/>
- <field name="user_id"/>
- <field name="widget_id"/>
- </tree>
- </field>
- </record>
- <record id="res_widget_user_form" model="ir.ui.view">
- <field name="name">res.widget.user.form</field>
- <field name="model">res.widget.user</field>
- <field name="arch" type="xml">
- <form string="User Widgets" version="7.0">
- <sheet>
- <group col="4">
- <field name="widget_id"/>
- <field name="user_id"/>
- <field name="sequence"/>
- </group>
- </sheet>
- </form>
- </field>
- </record>
- <record id="res_widget_user_act_window" model="ir.actions.act_window">
- <field name="name">Widgets per User</field>
- <field name="res_model">res.widget.user</field>
- <field name="view_type">form</field>
- <field name="view_mode">tree,form</field>
- </record>
- <menuitem action="res_widget_user_act_window" id="menu_res_widget_user_act_window" parent="base.next_id_2"/>
-
- <record id="view_res_widget_wizard" model="ir.ui.view">
- <field name="name">Homepage Widgets Management</field>
- <field name="model">res.widget.wizard</field>
- <field name="arch" type="xml">
- <form string="Widget Wizard" col="4" version="7.0">
- <header>
- <button name="res_widget_add" string="Add" type="object" class="oe_highlight"/>
- or
- <button string="Cancel" class="oe_link" special="cancel" />
- </header>
- <group>
- <field name="widgets_list"/>
- </group>
- </form>
- </field>
- </record>
- <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>
=== modified file 'openerp/addons/base/security/base_security.xml'
--- openerp/addons/base/security/base_security.xml 2012-09-19 08:52:04 +0000
+++ openerp/addons/base/security/base_security.xml 2012-10-22 06:04:19 +0000
@@ -46,12 +46,6 @@
<field name="groups_id" eval="[(6,0, [ref('group_system'), ref('group_erp_manager')])]"/>
</record>
- <record model="ir.rule" id="res_widget_user_rule">
- <field name="name">res.widget.user rule</field>
- <field name="model_id" ref="model_res_widget_user"/>
- <field name="domain_force">['|', ('user_id','=',user.id),('user_id','=',False)]</field>
- </record>
-
<record model="ir.rule" id="res_partner_rule">
<field name="name">res.partner company</field>
<field name="model_id" ref="model_res_partner"/>
=== modified file 'openerp/addons/base/security/ir.model.access.csv'
--- openerp/addons/base/security/ir.model.access.csv 2012-10-01 14:49:41 +0000
+++ openerp/addons/base/security/ir.model.access.csv 2012-10-22 06:04:19 +0000
@@ -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
@@ -114,8 +112,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
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
