Odoo Server (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-server/trunk-bug-1065988-aja into lp:openobject-server

  1. trunk-bug-1065988-aja
  2. Merge into trunk
Proposed by ajay javiya (OpenERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-server/trunk-bug-1065988-aja
Merge into: lp:openobject-server
Diff against target: 62 lines (+10/-6)
3 files modified
openerp/addons/base/module/module.py (+6/-4)
openerp/addons/base/module/wizard/base_module_update.py (+3/-2)
openerp/addons/base/module/wizard/base_module_update_view.xml (+1/-0)
To merge this branch: bzr merge lp:~openerp-dev/openobject-server/trunk-bug-1065988-aja
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+129886@code.launchpad.net

Description of the change

Hello,
Remove module from module list, after deleting the module from the addons folder and updating the module list.
Thank You

To post a comment you must log in.

Unmerged revisions

4493. By ajay javiya (OpenERP)

[FIX]:Remove Modules in Module update list

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'openerp/addons/base/module/module.py'
--- openerp/addons/base/module/module.py 2012-10-03 16:18:07 +0000
+++ openerp/addons/base/module/module.py 2012-10-16 13:25:04 +0000
@@ -516,17 +516,19 @@
516516
517 # update the list of available packages517 # update the list of available packages
518 def update_list(self, cr, uid, context=None):518 def update_list(self, cr, uid, context=None):
519 res = [0, 0] # [update, add]519 res = [0, 0, 0] # [update, add, delete]
520
521 known_mods = self.browse(cr, uid, self.search(cr, uid, []))520 known_mods = self.browse(cr, uid, self.search(cr, uid, []))
522 known_mods_names = dict([(m.name, m) for m in known_mods])521 known_mods_names = dict([(m.name, m) for m in known_mods])
523522
523 module_deleted = list(set(known_mods_names.keys()) - set(modules.get_modules()))
524 module_ids=self.search(cr,uid,[('name','in',module_deleted),('state','=','uninstalled')])
525 self.unlink(cr,uid,module_ids)
526 res[2] = len(module_deleted)
524 # iterate through detected modules and update/create them in db527 # iterate through detected modules and update/create them in db
525 for mod_name in modules.get_modules():528 for mod_name in modules.get_modules():
526 mod = known_mods_names.get(mod_name)529 mod = known_mods_names.get(mod_name)
527 terp = self.get_module_info(mod_name)530 terp = self.get_module_info(mod_name)
528 values = self.get_values_from_terp(terp)531 values = self.get_values_from_terp(terp)
529
530 if mod:532 if mod:
531 updated_values = {}533 updated_values = {}
532 for key in values:534 for key in values:
533535
=== modified file 'openerp/addons/base/module/wizard/base_module_update.py'
--- openerp/addons/base/module/wizard/base_module_update.py 2012-09-28 12:22:06 +0000
+++ openerp/addons/base/module/wizard/base_module_update.py 2012-10-16 13:25:04 +0000
@@ -29,6 +29,7 @@
29 _columns = {29 _columns = {
30 'update': fields.integer('Number of modules updated', readonly=True),30 'update': fields.integer('Number of modules updated', readonly=True),
31 'add': fields.integer('Number of modules added', readonly=True),31 'add': fields.integer('Number of modules added', readonly=True),
32 'delete':fields.integer('Number of modules deleted', readonly=True),
32 'state':fields.selection([('init','init'),('done','done')], 'state', readonly=True),33 'state':fields.selection([('init','init'),('done','done')], 'state', readonly=True),
33 }34 }
3435
@@ -38,8 +39,8 @@
3839
39 def update_module(self, cr, uid, ids, context=None):40 def update_module(self, cr, uid, ids, context=None):
40 module_obj = self.pool.get('ir.module.module')41 module_obj = self.pool.get('ir.module.module')
41 update, add = module_obj.update_list(cr, uid,)42 update, add, delete = module_obj.update_list(cr, uid,)
42 self.write(cr, uid, ids, {'update': update, 'add': add, 'state': 'done'}, context=context)43 self.write(cr, uid, ids, {'update': update, 'add': add,'delete': delete, 'state': 'done'}, context=context)
43 return False44 return False
4445
45 def action_module_open(self, cr, uid, ids, context):46 def action_module_open(self, cr, uid, ids, context):
4647
=== modified file 'openerp/addons/base/module/wizard/base_module_update_view.xml'
--- openerp/addons/base/module/wizard/base_module_update_view.xml 2012-08-17 07:25:55 +0000
+++ openerp/addons/base/module/wizard/base_module_update_view.xml 2012-10-16 13:25:04 +0000
@@ -15,6 +15,7 @@
15 <group states="done" >15 <group states="done" >
16 <field name="update"/>16 <field name="update"/>
17 <field name="add" />17 <field name="add" />
18 <field name="delete" />
18 </group>19 </group>
19 <footer>20 <footer>
20 <div states="init">21 <div states="init">