Reviewers: ,
Please review this at http://codereview.tryton.org/801002/
Affected files:
M trytond/ir/__init__.py
M trytond/ir/module/module.py
M trytond/ir/module/module.xml
A trytond/ir/view/module_config_wizard_last_form.xml
Index: trytond/ir/__init__.py
===================================================================
--- a/trytond/ir/__init__.py
+++ b/trytond/ir/__init__.py
@@ -67,16 +67,17 @@ def register():
ExportLine,
RuleGroup,
Rule,
Module,
ModuleDependency,
ModuleConfigWizardItem,
ModuleConfigWizardFirst,
ModuleConfigWizardOther,
+ ModuleConfigWizardLast,
ModuleInstallUpgradeStart,
ModuleInstallUpgradeDone,
Cache,
Date,
Trigger,
TriggerLog,
Session,
SessionWizard,
Index: trytond/ir/module/module.py
===================================================================
--- a/trytond/ir/module/module.py
+++ b/trytond/ir/module/module.py
@@ -7,17 +7,18 @@ from trytond.wizard import Wizard, State
from trytond.backend import TableHandler
from trytond.pool import Pool
from trytond.transaction import Transaction
from trytond.pyson import Eval
from trytond.rpc import RPC
__all__ = [
'Module', 'ModuleDependency', 'ModuleConfigWizardItem',
- 'ModuleConfigWizardFirst', 'ModuleConfigWizardOther', 'ModuleConfigWizard',
+ 'ModuleConfigWizardFirst', 'ModuleConfigWizardOther',
+ 'ModuleConfigWizardLast', 'ModuleConfigWizard',
'ModuleInstallUpgradeStart', 'ModuleInstallUpgradeDone',
'ModuleInstallUpgrade', 'ModuleConfig',
]
class Module(ModelSQL, ModelView):
"Module"
__name__ = "ir.module.module"
@@ -372,16 +373,21 @@ class ModuleConfigWizardOther(ModelView)
Item = pool.get('ir.module.module.config_wizard.item')
done = Item.search([
('state', '=', 'done'),
], count=True)
all = Item.search([], count=True)
return 100.0 * done / all
+class ModuleConfigWizardLast(ModelView):
+ 'Module Config Wizard Last'
+ __name__ = 'ir.module.module.config_wizard.last'
+
+
class ModuleConfigWizard(Wizard):
'Run config wizards'
__name__ = 'ir.module.module.config_wizard'
class ConfigStateAction(StateAction):
def __init__(self):
StateAction.__init__(self, None)
@@ -408,31 +414,37 @@ class ModuleConfigWizard(Wizard):
Button('Ok', 'action', 'tryton-ok', default=True),
])
other = StateView('ir.module.module.config_wizard.other',
'ir.module_config_wizard_other_view_form', [
Button('Cancel', 'end', 'tryton-cancel'),
Button('Next', 'action', 'tryton-go-next', default=True),
])
action = ConfigStateAction()
+ last = StateView('ir.module.module.config_wizard.last',
+ 'ir.module_config_wizard_last_view_form', [])
+ last_action = StateTransition()
def transition_start(self):
res = self.transition_action()
if res == 'other':
return 'first'
return res
def transition_action(self):
pool = Pool()
Item = pool.get('ir.module.module.config_wizard.item')
items = Item.search([
('state', '=', 'open'),
])
if items:
return 'other'
+ return 'last'
+
+ def transition_last_action(self):
return 'end'
class ModuleInstallUpgradeStart(ModelView):
'Module Install Upgrade Start'
__name__ = 'ir.module.module.install_upgrade.start'
module_info = fields.Text('Modules to update', readonly=True)
Index: trytond/ir/module/module.xml
===================================================================
--- a/trytond/ir/module/module.xml
+++ b/trytond/ir/module/module.xml
@@ -78,16 +78,22 @@ this repository contains the full copyri
<record model="ir.ui.view"
id="module_config_wizard_first_view_form">
<field
name="model">ir.module.module.config_wizard.first</field>
<field name="type">form</field>
<field name="name">module_config_wizard_first_form</field>
</record>
+ <record model="ir.ui.view"
id="module_config_wizard_last_view_form">
+ <field name="model">ir.module.module.config_wizard.last</field>
+ <field name="type">form</field>
+ <field name="name">module_config_wizard_last_form</field>
+ </record>
+
<record model="ir.ui.view"
id="module_config_wizard_other_view_form">
<field
name="model">ir.module.module.config_wizard.other</field>
<field name="type">form</field>
<field name="name">module_config_wizard_other_form</field>
</record>
<record model="ir.action.wizard" id="act_module_install_upgrade">
<field name="name">Perform Pending Installation/Upgrade</field>
Index: trytond/ir/view/module_config_wizard_last_form.xml
===================================================================
new file mode 100644
--- /dev/null
+++ b/trytond/ir/view/module_config_wizard_last_form.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<form>
+</form>
