Browse Source

Deleted the get_relation call in leapidatasource's update_rank method

Roland Haroutiounian 9 years ago
parent
commit
141ba96de3
3 changed files with 6 additions and 8 deletions
  1. 4
    6
      DataSource/MySQL/leapidatasource.py
  2. 1
    1
      leapi/lerelation.py
  3. 1
    1
      leapi/test/test_lerelation.py

+ 4
- 6
DataSource/MySQL/leapidatasource.py View File

@@ -411,12 +411,10 @@ class LeDataSourceSQL(DummyDatasource):
411 411
     # @return True if success, False if failure
412 412
     # TODO Conserver cette méthode dans le datasource du fait des requêtes SQL. Elle est appelée par le set_rank de LeRelation
413 413
     def update_rank(self, le_relation, rank):
414
-        ret = self.get_relation(le_relation.id_relation, no_attr=True)
415
-        if not ret:
416
-            raise leapi.leapi.LeObjectQueryError("No relation with id_relation = %d" % le_relation.id_relation)
417
-        lesup = ret['lesup']
418
-        lesub = ret['lesub']
419
-        current_rank = ret['rank']
414
+
415
+        lesup = le_relation.lesup
416
+        lesub = le_relation.lesub
417
+        current_rank = le_relation.rank
420 418
 
421 419
         relations = self.get_related(lesup, lesub.__class__, get_sub=True)
422 420
 

+ 1
- 1
leapi/lerelation.py View File

@@ -133,7 +133,7 @@ class _LeRelation(lecrud._LeCrud):
133 133
     ## @returns The maximum assignable rank for this relation
134 134
     # @todo implementation
135 135
     def get_max_rank(self):
136
-        pass
136
+        return self._datasource.select(self.__class__, ['rank'])
137 137
 
138 138
 ## @brief Abstract class to handle hierarchy relations
139 139
 class _LeHierarch(_LeRelation):

+ 1
- 1
leapi/test/test_lerelation.py View File

@@ -77,7 +77,7 @@ class LeRelationTestCase(TestCase):
77 77
         dsmock.assert_called_once_with(LeHierarch, [('lesup', '=', Numero(42)), ('nature','=','"parent"')])
78 78
         dsmock.reset_mock()
79 79
 
80
-    
80
+
81 81
 class LeHierarch(LeRelationTestCase):
82 82
     
83 83
     @patch('DataSource.dummy.leapidatasource.DummyDatasource.select')

Loading…
Cancel
Save