X-Git-Url: http://git.inspyration.org/?a=blobdiff_plain;f=bin%2Fwizard%2F__init__.py;h=7302f4d4348cda45da5276b929d5580f74699eee;hb=b8581f1b03f8fffc700fa2f6e8ca425f5464f0db;hp=72be97b3958f4c58b1650936c642d3f1223fbeea;hpb=75a195153fc2db09fc7e60249f939a565fd6f72e;p=odoo%2Fodoo.git diff --git a/bin/wizard/__init__.py b/bin/wizard/__init__.py index 72be97b..7302f4d 100644 --- a/bin/wizard/__init__.py +++ b/bin/wizard/__init__.py @@ -1,30 +1,29 @@ -# -*- encoding: utf-8 -*- +# -*- coding: utf-8 -*- ############################################################################## -# -# OpenERP, Open Source Management Solution -# Copyright (C) 2004-2008 Tiny SPRL (). All Rights Reserved -# $Id$ +# +# 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 General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. +# 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 General Public License for more details. +# GNU Affero General Public License for more details. # -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . # ############################################################################## import netsvc -import copy +from tools import copy from tools.misc import UpdateableStr, UpdateableDict from tools.translate import translate -from xml import dom +from lxml import etree import ir import pooler @@ -42,20 +41,19 @@ class except_wizard(Exception): class interface(netsvc.Service): states = {} - + def __init__(self, name): - assert not netsvc.service_exist('wizard.'+name), 'The wizard "%s" already exists!'%name + assert not self.exists('wizard.'+name), 'The wizard "%s" already exists!' % (name,) super(interface, self).__init__('wizard.'+name) self.exportMethod(self.execute) self.wiz_name = name - + def translate_view(self, cr, node, state, lang): - if node.nodeType == node.ELEMENT_NODE: - if node.hasAttribute('string') and node.getAttribute('string'): - trans = translate(cr, self.wiz_name+','+state, 'wizard_view', lang, node.getAttribute('string').encode('utf8')) - if trans: - node.setAttribute('string', trans.decode('utf8')) - for n in node.childNodes: + if node.get('string'): + trans = translate(cr, self.wiz_name+','+state, 'wizard_view', lang, node.get('string').encode('utf8')) + if trans: + node.set('string', trans) + for n in node: self.translate_view(cr, n, state, lang) def execute_cr(self, cr, uid, data, state='init', context=None): @@ -64,6 +62,7 @@ class interface(netsvc.Service): res = {} try: state_def = self.states[state] + result_def = state_def.get('result', {}) actions_res = {} @@ -81,7 +80,7 @@ class interface(netsvc.Service): if result_def['type'] == 'action': res['action'] = result_def['action'](self, cr, uid, data, context) elif result_def['type'] == 'form': - fields = copy.copy(result_def['fields']) + fields = copy.deepcopy(result_def['fields']) arch = copy.copy(result_def['arch']) button_list = copy.copy(result_def['state']) @@ -109,24 +108,31 @@ class interface(netsvc.Service): if not isinstance(fields[val]['selection'], (tuple, list)): fields[val] = copy.copy(fields[val]) fields[val]['selection'] = fields[val]['selection'](self, cr, uid, context) + elif lang: + res_name = "%s,%s,%s" % (self.wiz_name, state, val) + trans = lambda x: translate(cr, res_name, 'selection', lang, x) or x + for idx, (key, val2) in enumerate(fields[val]['selection']): + fields[val]['selection'][idx] = (key, trans(val2)) if lang: # translate fields for field in fields: - trans = translate(cr, self.wiz_name+','+state+','+field, 'wizard_field', lang) + res_name = "%s,%s,%s" % (self.wiz_name, state, field) + + trans = translate(cr, res_name, 'wizard_field', lang) if trans: fields[field]['string'] = trans - - if 'selection' in fields[field]: - trans = lambda x: translate(cr, self.wiz_name+','+state+','+field, 'selection', lang, x) or x - for idx, (key, val) in enumerate(fields[field]['selection']): - fields[field]['selection'][idx] = (key, trans(val)) + + if 'help' in fields[field]: + t = translate(cr, res_name, 'help', lang, fields[field]['help']) + if t: + fields[field]['help'] = t # translate arch if not isinstance(arch, UpdateableStr): - doc = dom.minidom.parseString(arch) + doc = etree.XML(arch) self.translate_view(cr, doc, state, lang) - arch = doc.toxml() + arch = etree.tostring(doc) # translate buttons button_list = list(button_list) @@ -142,6 +148,10 @@ class interface(netsvc.Service): res['arch'] = arch res['state'] = button_list + elif result_def['type'] == 'choice': + next_state = result_def['next_state'](self, cr, uid, data, context) + return self.execute_cr(cr, uid, data, next_state, context) + except Exception, e: if isinstance(e, except_wizard) \ or isinstance(e, except_osv) \ @@ -156,9 +166,6 @@ class interface(netsvc.Service): 'Exception in call: ' + tb_s) raise - if result_def['type'] == 'choice': - next_state = result_def['next_state'](self, cr, uid, data, context) - return self.execute_cr(cr, uid, data, next_state, context) return res def execute(self, db, uid, data, state='init', context=None):