From f917fe27b07a4e95b6bc4d02b9308f0dd34bfbe9 Mon Sep 17 00:00:00 2001 From: "ksa (Open ERP)" Date: Thu, 26 Aug 2010 15:48:50 +0530 Subject: [IMP] Import module wizard convert into osv memory wizard bzr revid: ksa@tinyerp.co.in-20100826101850-e8tsrqre2ksdpr3b --- .../base/module/wizard/base_module_import.py | 65 ++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 bin/addons/base/module/wizard/base_module_import.py (limited to 'bin/addons/base/module/wizard/base_module_import.py') diff --git a/bin/addons/base/module/wizard/base_module_import.py b/bin/addons/base/module/wizard/base_module_import.py new file mode 100644 index 00000000000..fc28452c6dd --- /dev/null +++ b/bin/addons/base/module/wizard/base_module_import.py @@ -0,0 +1,65 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2010 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 . +# +############################################################################## + + +import pooler +import os +import tools + +import zipfile +from StringIO import StringIO +import base64 +from tools.translate import _ +from osv import osv, fields + +class base_module_import(osv.osv_memory): + """ Import Module """ + + _name = "base.module.import" + _description = "Import Module" + + _columns = { + 'module_file': fields.binary('Module .ZIP file', required=True), + } + + def action_module_open(self, cr, uid, ids, context): + module_obj = self.pool.get('base.module.import') + data = module_obj.browse(cr, uid, ids , context=context)[0] + module_data = data.module_file + + val =base64.decodestring(module_data) + fp = StringIO() + fp.write(val) + fdata = zipfile.ZipFile(fp, 'r') + fname = fdata.namelist()[0] + module_name = os.path.split(fname)[0] + + return { + 'domain': str([('name', '=', module_name)]), + 'name': 'Module List', + 'view_type': 'form', + 'view_mode': 'tree,form', + 'res_model': 'ir.module.module', + 'type': 'ir.actions.act_window', + } + +base_module_import() + -- cgit v1.2.3 From 086e88d4ce2494d8f242599db13a59418bec091b Mon Sep 17 00:00:00 2001 From: "ksa (Open ERP)" Date: Thu, 26 Aug 2010 18:05:54 +0530 Subject: [IMP]: convert old wizard into osv memory wizard for update module bzr revid: ksa@tinyerp.co.in-20100826123554-2zd5yvp33slx8xfm --- .../base/module/wizard/base_module_import.py | 51 +++++++++++++++++++++- 1 file changed, 50 insertions(+), 1 deletion(-) (limited to 'bin/addons/base/module/wizard/base_module_import.py') diff --git a/bin/addons/base/module/wizard/base_module_import.py b/bin/addons/base/module/wizard/base_module_import.py index fc28452c6dd..cd916482279 100644 --- a/bin/addons/base/module/wizard/base_module_import.py +++ b/bin/addons/base/module/wizard/base_module_import.py @@ -40,6 +40,55 @@ class base_module_import(osv.osv_memory): 'module_file': fields.binary('Module .ZIP file', required=True), } + def importzip(self, cr, uid, ids, context): + module_obj= self.pool.get('ir.module.module') + active_ids = context and context.get('active_ids', False) + data = self.browse(cr, uid, ids , context=context)[0] + module_data = data.module_file + + val =base64.decodestring(module_data) + fp = StringIO() + fp.write(val) + fdata = zipfile.ZipFile(fp, 'r') + fname = fdata.namelist()[0] + module_name = os.path.split(fname)[0] + + ad = tools.config['addons_path'] + + fname = os.path.join(ad,module_name+'.zip') + try: + fp = file(fname, 'wb') + fp.write(val) + fp.close() + except IOError, e: + raise osv.except_osv(_('Error !'), _('Can not create the module file: %s !') % (fname,) ) + + module_obj.update_list(cr, uid,{'module_name': module_name,}) + data_obj = self.pool.get('ir.model.data') + id2 = data_obj._get_id(cr, uid, 'base', 'view_base_module_import_msg') + if id2: + id2 = data_obj.browse(cr, uid, id2, context=context).res_id + + module_name = module_obj.browse(cr, uid, ids, context=context) + return { + 'domain': str([('name', '=', module_name)]), + 'name': 'Message', + 'view_type': 'form', + 'view_mode': 'form', + 'res_model': 'base.module.import.msg', + 'views': [(id2, 'form')], + 'view_id': False, + 'type': 'ir.actions.act_window', + 'target': 'new', + } + +base_module_import() + +class base_module_import_msg(osv.osv_memory): + """ message """ + _name = "base.module.import.msg" + _description = "Message" + def action_module_open(self, cr, uid, ids, context): module_obj = self.pool.get('base.module.import') data = module_obj.browse(cr, uid, ids , context=context)[0] @@ -61,5 +110,5 @@ class base_module_import(osv.osv_memory): 'type': 'ir.actions.act_window', } -base_module_import() +base_module_import_msg() \ No newline at end of file -- cgit v1.2.3 From cd527b6c9d3a7337ae689b54325a1bb574b3b285 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Mon, 4 Oct 2010 16:33:36 +0200 Subject: [IMP] base: refactor/unify base module wizards bzr revid: odo@openerp.com-20101004143336-nh0vnvbipt5dvmna --- .../base/module/wizard/base_module_import.py | 67 ++++++---------------- 1 file changed, 19 insertions(+), 48 deletions(-) (limited to 'bin/addons/base/module/wizard/base_module_import.py') diff --git a/bin/addons/base/module/wizard/base_module_import.py b/bin/addons/base/module/wizard/base_module_import.py index 990a77ce8cd..68822690f45 100644 --- a/bin/addons/base/module/wizard/base_module_import.py +++ b/bin/addons/base/module/wizard/base_module_import.py @@ -19,8 +19,6 @@ # ############################################################################## - -import pooler import os import tools @@ -34,19 +32,24 @@ class base_module_import(osv.osv_memory): """ Import Module """ _name = "base.module.import" + _inherit = "ir.wizard.screen" _description = "Import Module" _columns = { 'module_file': fields.binary('Module .ZIP file', required=True), + 'state':fields.selection([('init','init'),('done','done')], 'state', readonly=True), + 'module_name': fields.char('Module Name', size=128), + } + + _defaults = { + 'state': 'init', } def importzip(self, cr, uid, ids, context): - module_obj= self.pool.get('ir.module.module') - active_ids = context and context.get('active_ids', False) - data = self.browse(cr, uid, ids , context=context)[0] + (data,) = self.browse(cr, uid, ids , context=context) module_data = data.module_file - val =base64.decodestring(module_data) + val = base64.decodestring(module_data) fp = StringIO() fp.write(val) fdata = zipfile.ZipFile(fp, 'r') @@ -55,62 +58,30 @@ class base_module_import(osv.osv_memory): ad = tools.config['addons_path'] - fname = os.path.join(ad,module_name+'.zip') + fname = os.path.join(ad, module_name+'.zip') try: fp = file(fname, 'wb') fp.write(val) fp.close() - except IOError, e: + except IOError: raise osv.except_osv(_('Error !'), _('Can not create the module file: %s !') % (fname,) ) - module_obj.update_list(cr, uid,{'module_name': module_name,}) - data_obj = self.pool.get('ir.model.data') - id2 = data_obj._get_id(cr, uid, 'base', 'view_base_module_import_msg') - if id2: - id2 = data_obj.browse(cr, uid, id2, context=context).res_id - - module_name = module_obj.browse(cr, uid, ids, context=context) - return { - 'domain': str([('name', '=', module_name)]), - 'name': 'Message', - 'view_type': 'form', - 'view_mode': 'form', - 'res_model': 'base.module.import.msg', - 'views': [(id2, 'form')], - 'view_id': False, - 'type': 'ir.actions.act_window', - 'target': 'new', - } - -base_module_import() - -class base_module_import_msg(osv.osv_memory): - """ message """ - _name = "base.module.import.msg" - _description = "Message" + self.pool.get('ir.module.module').update_list(cr, uid, {'module_name': module_name,}) + self.write(cr, uid, ids, {'state':'done', 'module_name': module_name}, context) + return False def action_module_open(self, cr, uid, ids, context): - module_obj = self.pool.get('base.module.import') - data = module_obj.browse(cr, uid, ids , context=context)[0] - module_data = data.module_file - - val =base64.decodestring(module_data) - fp = StringIO() - fp.write(val) - fdata = zipfile.ZipFile(fp, 'r') - fname = fdata.namelist()[0] - module_name = os.path.split(fname)[0] - + (data,) = self.browse(cr, uid, ids , context=context) return { - 'domain': str([('name', '=', module_name)]), - 'name': 'Module List', + 'domain': str([('name', '=', data.module_name)]), + 'name': 'Modules', 'view_type': 'form', 'view_mode': 'tree,form', 'res_model': 'ir.module.module', 'type': 'ir.actions.act_window', } -base_module_import_msg() +base_module_import() -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file -- cgit v1.2.3 From 1ec3503256348ba6bd1080952411c2b83d38f70e Mon Sep 17 00:00:00 2001 From: nvi-openerp Date: Tue, 26 Oct 2010 11:57:59 +0200 Subject: [FIX] Fixed a little bug with multi addon path + changed minimal chart module name bzr revid: nicolas.vanhoren@openerp.com-20101026095759-201hggg8n39hmdtm --- bin/addons/base/module/wizard/base_module_import.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bin/addons/base/module/wizard/base_module_import.py') diff --git a/bin/addons/base/module/wizard/base_module_import.py b/bin/addons/base/module/wizard/base_module_import.py index 68822690f45..05c3b18198d 100644 --- a/bin/addons/base/module/wizard/base_module_import.py +++ b/bin/addons/base/module/wizard/base_module_import.py @@ -56,7 +56,7 @@ class base_module_import(osv.osv_memory): fname = fdata.namelist()[0] module_name = os.path.split(fname)[0] - ad = tools.config['addons_path'] + ad = tools.config['addons_path'].split(",")[-1] fname = os.path.join(ad, module_name+'.zip') try: -- cgit v1.2.3