Преглед изворни кода

Improved code and removed unused code.

Yogesh Sakhreliya пре 9 година
родитељ
комит
ff8e3ae638
2 измењених фајлова са 25 додато и 37 уклоњено
  1. 11 19
      mass_editing/models/mass_editing.py
  2. 14 18
      mass_editing/wizard/mass_editing_wizard.py

+ 11 - 19
mass_editing/models/mass_editing.py

@@ -42,8 +42,8 @@ class IrModelFields(models.Model):
             cr, uid, model_domain, offset=offset, limit=limit, order=order,
             cr, uid, model_domain, offset=offset, limit=limit, order=order,
             context=context, count=count
             context=context, count=count
         )
         )
-    
-class mass_object(models.Model):
+
+class MassObject(models.Model):
     _name = "mass.object"
     _name = "mass.object"
 
 
     name = fields.Char(string="Name", required=True, select=1)
     name = fields.Char(string="Name", required=True, select=1)
@@ -70,8 +70,6 @@ class mass_object(models.Model):
             self.model_ids = [(6, 0, [])]
             self.model_ids = [(6, 0, [])]
 
 
         model_ids = [self.model_id.id]
         model_ids = [self.model_id.id]
-        model_obj = self.env['ir.model']
-        # active_model_obj = self.env[model_obj.browse(self.model_id.id).model]
         self.model_ids = [[6, 0, model_ids]]
         self.model_ids = [[6, 0, model_ids]]
         self.model_list = [self.model_ids.id]
         self.model_list = [self.model_ids.id]
 
 
@@ -79,7 +77,6 @@ class mass_object(models.Model):
     def create_action(self):
     def create_action(self):
         vals = {}
         vals = {}
         action_obj = self.env['ir.actions.act_window']
         action_obj = self.env['ir.actions.act_window']
-        data_obj = self.env['ir.model.data']
         src_obj = self.model_id.model
         src_obj = self.model_id.model
         button_name = _('Mass Editing (%s)') % self.name
         button_name = _('Mass Editing (%s)') % self.name
         vals['ref_ir_act_window'] = action_obj.create({
         vals['ref_ir_act_window'] = action_obj.create({
@@ -110,31 +107,27 @@ class mass_object(models.Model):
 
 
     @api.one
     @api.one
     def unlink_action(self):
     def unlink_action(self):
-                if self.ref_ir_act_window:
-                    winid = self.ref_ir_act_window.id
-                    self.env['ir.actions.act_window'].search([('id', '=', winid)]).unlink()
-
-                if self.ref_ir_value:
-                    uinid = self.ref_ir_value.id
-                    self.env['ir_values'].search([('id', '=', uinid)]).unlink()
+        if self.ref_ir_act_window:
+            self.env['ir.actions.act_window'].search([('id', '=', self.ref_ir_act_window.id)]).unlink()
+        if self.ref_ir_value:
+            self.env['ir_values'].search([('id', '=', self.ref_ir_value.id)]).unlink()
 
 
     @api.one
     @api.one
     def unlink(self):
     def unlink(self):
         self.unlink_action()
         self.unlink_action()
-        return super(mass_object, self).unlink()
+        return super(MassObject, self).unlink()
 
 
     @api.multi
     @api.multi
     def copy(self, default):
     def copy(self, default):
         if default is None:
         if default is None:
             default = {}
             default = {}
-
         default.update({'name':'', 'field_ids': []})
         default.update({'name':'', 'field_ids': []})
-        return super(mass_object, self).copy(default)
+        return super(MassObject, self).copy(default)
 
 
-class ir_module_module(models.Model):
+class IrModuleModule(models.Model):
 
 
     _inherit = 'ir.module.module'
     _inherit = 'ir.module.module'
-    
+
     @api.multi
     @api.multi
     def module_uninstall(self):
     def module_uninstall(self):
         cr, uid, context = self.env.args
         cr, uid, context = self.env.args
@@ -143,5 +136,4 @@ class ir_module_module(models.Model):
         if self.name == 'mass_editing':
         if self.name == 'mass_editing':
             action_ids = action_obj.search (cr, uid, [('res_model', '=', 'mass.editing.wizard')], context=context)
             action_ids = action_obj.search (cr, uid, [('res_model', '=', 'mass.editing.wizard')], context=context)
             action_obj.unlink(cr, uid, action_ids, context=context)
             action_obj.unlink(cr, uid, action_ids, context=context)
-        return super(ir_module_module, self).module_uninstall()
-    
+        return super(IrModuleModule, self).module_uninstall()

+ 14 - 18
mass_editing/wizard/mass_editing_wizard.py

@@ -27,11 +27,10 @@ class mass_editing_wizard(models.Model):
     _name = 'mass.editing.wizard'
     _name = 'mass.editing.wizard'
 
 
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
-      if context is None:
-          context = {}
-      result = super(mass_editing_wizard, self).fields_view_get(cr, uid, view_id, view_type, context=context, toolbar=toolbar, submenu=submenu)
-    
-      if context.get('mass_editing_object'):
+        if context is None:
+            context = {}
+        result = super(mass_editing_wizard, self).fields_view_get(cr, uid, view_id, view_type, context=context, toolbar=toolbar, submenu=submenu)
+        if context.get('mass_editing_object'):
             mass_object = self.pool['mass.object'] 
             mass_object = self.pool['mass.object'] 
             editing_data = mass_object.browse(cr, uid, context.get('mass_editing_object'))
             editing_data = mass_object.browse(cr, uid, context.get('mass_editing_object'))
             all_fields = {}
             all_fields = {}
@@ -96,33 +95,30 @@ class mass_editing_wizard(models.Model):
             root = xml_form.getroottree()
             root = xml_form.getroottree()
             result['arch'] = etree.tostring(root)
             result['arch'] = etree.tostring(root)
             result['fields'] = all_fields
             result['fields'] = all_fields
-      return result
-    
+        return result
+
     @api.model
     @api.model
     def create(self, vals):
     def create(self, vals):
         if self._context.get('active_model') and self._context.get('active_ids'):
         if self._context.get('active_model') and self._context.get('active_ids'):
             model_obj = self.env[self._context.get('active_model')]
             model_obj = self.env[self._context.get('active_model')]
-            dict = {}
+            values = {}
             for key , val in vals.items():
             for key , val in vals.items():
-                
                 if key.startswith('selection_'):
                 if key.startswith('selection_'):
                     split_key = key.split('__', 1)[1]
                     split_key = key.split('__', 1)[1]
                     if val == 'set':
                     if val == 'set':
-                        dict.update({split_key: vals.get(split_key, False)})
-                        print dict
+                        values.update({split_key: vals.get(split_key, False)})
                     elif val == 'remove':
                     elif val == 'remove':
-                        dict.update({split_key: False})
+                        values.update({split_key: False})
                     elif val == 'remove_m2m':
                     elif val == 'remove_m2m':
-                        dict.update({split_key: [(5, 0, [])]})
+                        values.update({split_key: [(5, 0, [])]})
                     elif val == 'add':
                     elif val == 'add':
                         m2m_list = []
                         m2m_list = []
                         for m2m_id in vals.get(split_key, False)[0][2]:
                         for m2m_id in vals.get(split_key, False)[0][2]:
                             m2m_list.append((4, m2m_id))
                             m2m_list.append((4, m2m_id))
-                        dict.update({split_key: m2m_list})
-            if dict:
-               model_obj.browse(self._context.get('active_ids')).write(dict)
-        result = super(mass_editing_wizard, self).create({})
-        return result
+                        values.update({split_key: m2m_list})
+            if values:
+                model_obj.browse(self._context.get('active_ids')).write(values)
+        return super(mass_editing_wizard, self).create({})
 
 
     @api.v7
     @api.v7
     def action_apply(self, cr, uid, ids, context=None):
     def action_apply(self, cr, uid, ids, context=None):