Browse Source

Corrections

prieto 8 years ago
parent
commit
c3e62e57be
2 changed files with 7 additions and 9 deletions
  1. 4
    6
      lodel/leapi/leobject.py
  2. 3
    3
      lodel/leapi/query.py

+ 4
- 6
lodel/leapi/leobject.py View File

@@ -512,12 +512,10 @@ raised when trying to import Datasource"
512 512
         query_filter = list()
513 513
         for uid in uids:
514 514
             query_filter.append((uid, '=', self.data(uid)))
515
-        query = LeDeleteQuery(cls, query_filter)
516
-        try:
517
-            result = query.execute()
518
-        except LeQueryError as err:
519
-            raise err
520
-            
515
+        query = LeDeleteQuery(self.name2class(self.__class__.__name__), query_filter)
516
+
517
+        result = query.execute()
518
+
521 519
         return result
522 520
     
523 521
     ## @brief Delete instances of LeObject

+ 3
- 3
lodel/leapi/query.py View File

@@ -40,7 +40,7 @@ class LeQuery(object):
40 40
             self._target_class.check_datas_value(
41 41
                                                     datas['datas'],
42 42
                                                     **self._data_check_args)
43
-            self._target_class.prepare_datas() #not yet implemented
43
+            self._target_class.prepare_datas(datas['datas']) #not yet implemented
44 44
         if self._hook_prefix is None:
45 45
             raise NotImplementedError("Abstract method")
46 46
         LodelHook.call_hook(    self._hook_prefix+'_pre',
@@ -118,10 +118,10 @@ class LeFilteredQuery(LeQuery):
118 118
         self.__query_filter = (std_filters, rel_filters)
119 119
         try:
120 120
             filters, rel_filters = self.__query_filter
121
-            res = super().execute(filters = filters, rel_filters = rel_filters)
121
+            res = super().execute(filters = filters, rel_filters = rel_filters, datas)
122 122
         except Exception as e:
123 123
             #restoring filters even if an exception is raised
124
-            self.__query_filter = orig_filter
124
+            self.__query_filter = orig_filters
125 125
             raise e #reraise
126 126
         #restoring filters
127 127
         self.__query_filter = orig_filters

Loading…
Cancel
Save