[REM,FIX]: * Removed old configuration wizard

* Fix action when there is no config wizard to execute

bzr revid: rpa@tinyerp.com-20100922103712-n217m5xjl4wptuku

diff --git a/bin/addons/base/ir/ir.xml b/bin/addons/base/ir/ir.xml
index 76f3ca3..5890317 100644 (file)
--- a/bin/addons/base/ir/ir.xml
+++ b/bin/addons/base/ir/ir.xml
@@ -1958,14 +1958,8 @@
         </record>
         <menuitem id="next_id_11" name="Configuration Wizards" parent="base.menu_config" sequence="1"/>
 
-        <wizard id="wizard_configuration" model="ir.module.module" name="module.configuration" string="Start Configuration"/>
         <menuitem action="act_ir_actions_todo_form" id="menu_ir_actions_todo_form"
                 parent="next_id_11" groups="base.group_extended" sequence="20"/>
 
-        <menuitem
-            action="wizard_configuration" name="Start Configuration"
-            id="menu_configurator_module" parent="next_id_11"
-            type="wizard"/>
-
     </data>
 </openerp>

diff --git a/bin/addons/base/module/wizard/__init__.py b/bin/addons/base/module/wizard/__init__.py
index 76e7b32..a4133a5 100644 (file)
--- a/bin/addons/base/module/wizard/__init__.py
+++ b/bin/addons/base/module/wizard/__init__.py
@@ -19,9 +19,6 @@
 #
 ##############################################################################
 
-#Old Wizard 
-import wizard_configuration
-
 import base_module_import
 import base_module_update
 import base_language_install

diff --git a/bin/addons/base/module/wizard/base_module_configuration.py b/bin/addons/base/module/wizard/base_module_configuration.py
index 838b63e..909637c 100644 (file)
--- a/bin/addons/base/module/wizard/base_module_configuration.py
+++ b/bin/addons/base/module/wizard/base_module_configuration.py
@@ -38,8 +38,9 @@ class base_module_configuration(osv.osv_memory):
                     'view_type': 'form', 
                     'view_mode': 'form', 
                     'res_model': 'base.module.configuration', 
-                    'view_id': view_id, 
+                    'view_id': [view_id], 
                     'type': 'ir.actions.act_window', 
+                    'target': 'new'
                 }
             return value
         # Run the config wizards

diff --git a/bin/addons/base/module/wizard/base_module_configuration_view.xml b/bin/addons/base/module/wizard/base_module_configuration_view.xml
index 14221e6..559273b 100644 (file)
--- a/bin/addons/base/module/wizard/base_module_configuration_view.xml
+++ b/bin/addons/base/module/wizard/base_module_configuration_view.xml
@@ -7,8 +7,8 @@
             <field name="model">base.module.configuration</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="System Configuration done">
-                    <label align="0.0" string="All pending configuration wizards have been executed. You may restart individual wizards via the list of configuration wizards" colspan="4"/>
+                <form string="System Configuration Done">
+                    <label align="0.0" string="All pending configuration wizards have been executed. You may restart individual wizards via the list of configuration wizards." colspan="4"/>
                     <separator string="" colspan="4"/>
                     <newline/>
                     <button special="cancel" string="_Ok" icon="gtk-ok"/>

diff --git a/bin/addons/base/module/wizard/wizard_configuration.py b/bin/addons/base/module/wizard/wizard_configuration.py
deleted file mode 100644 (file)
index bae1496..0000000
--- a/bin/addons/base/module/wizard/wizard_configuration.py
+++ /dev/null
@@ -1,43 +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/>.     
-#
-##############################################################################
-
-import wizard
-import pooler
-
-class wizard_configuration(wizard.interface):   
-
-    def _config(self, cr, uid, data, context=None):
-        return pooler.get_pool(cr.dbname).get('res.config')\
-            .next(cr, uid, [], context=context)
-
-    states = {        
-        'init':{
-            'result': {
-                'type': 'action',
-                'action': _config,
-                'state': 'end',
-            },
-        }
-    }
-wizard_configuration('module.configuration')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-