Fixing component deletion

EditorialModel/classes.py

@@ -42,18 +42,14 @@ class EmClass(EmComponent):
     ## @brief Delete a class if it's ''empty''
     # If a class has no fieldgroups delete it
     # @return bool : True if deleted False if deletion aborded
-    def delete(self):
+    def delete_check(self):
         for emtype in self.model.components(EmType):
             if emtype.class_id == self.uid:
                 return False
         for fieldgroup in self.model.components(EditorialModel.fieldgroups.EmFieldGroup):
             if fieldgroup.class_id == self.uid:
                 return False
-
-        if self.model.delete_component(self.uid):
-            return self.check()
-        else:
-            return False
+        return True
 
     ## Retrieve list of the field_groups of this class
     # @return A list of fieldgroups instance

EditorialModel/components.py

@@ -99,6 +99,11 @@ class EmComponent(object):
                 component.rank = i + 1
         # No need to sort again here
 
+    ## @brief Delete predicate. Indicates if a component can be deleted
+    # @return True if deletion OK else return False
+    def delete_check(self):
+        raise NotImplementedError("Virtual method")
+
     ## @brief Get the maximum rank given an EmComponent child class and a ranked_in filter
     # @return A positive integer or -1 if no components
     def get_max_rank(self):

EditorialModel/fieldgroups.py

@@ -31,17 +31,13 @@ class EmFieldGroup(EmComponent):
             raise EmComponentCheckError("class_id cointains an uid from a component that is not an EmClass but an "+type(em_class))
 
     ## Deletes a fieldgroup
-    # @return True if the deletion is a success, False if not
-    def delete(self):
+    # @return True if the deletion is possible, False if not
+    def delete_check(self):
         # all the EmField objects contained in this fieldgroup should be deleted first
         fieldgroup_fields = self.fields()
         if len(fieldgroup_fields) > 0:
             raise NotEmptyError("This Fieldgroup still contains fields. It can't be deleted then")
-        # then we delete this fieldgroup
-        if self.model.delete_component(self.uid):
-            return self.check()
-        else:
-            return False
+        return True
 
     ## Get the list of associated fields
     # if type_id, the fields will be filtered to represent selected fields of this EmType

EditorialModel/fields.py

@@ -43,8 +43,5 @@ class EmField(EmComponent):
     ## @brief Delete a field if it's not linked
     # @return bool : True if deleted False if deletion aborded
     # @todo Check if unconditionnal deletion is correct
-    def delete(self):
-        if self.model.delete_component(self.uid):
-            return self.check()
-        else:
-            return False
+    def delete_check(self):
+        return True

EditorialModel/model.py

@@ -153,11 +153,11 @@ class Model(object):
     def delete_component(self, uid):
         #register the deletion in migration handler
         self.migration_handler.register_change(uid, self.component(uid).attr_dump, None)
-
-        if uid not in self._components[uid]:
+        
+        em_component = self.component(uid)
+        if not em_component:
             raise EditorialModel.components.EmComponentNotExistError()
-        em_component = self._components[uid]
-        if em_component.delete_p():
+        if em_component.delete_check():
             self._components[self.name_from_emclass(em_component.__class__)].remove(em_component)
             del self._components['uids'][uid]
         return True

EditorialModel/types.py

@@ -79,17 +79,14 @@ class EmType(EmComponent):
     # @return True if delete False if not deleted
     # @todo Check if the type is not linked by any EmClass
     # @todo Check if there is no other ''non-deletion'' conditions
-    def delete(self):
+    def delete_check(self):
         if sum(self.subordinates_list) > 0:
             return False
         #Delete all relation with superiors
         for nature, sups in self.superiors().items():
             for sup in sups:
                 self.del_superior(sup, nature)
-        if super(EmType, self).delete():
-            return self.check()
-        else:
-            return False
+        return True
 
     ## Get the list of non empty associated fieldgroups
     # @return A list of EmFieldGroup instance