Browse Source

Correction :-(

Driky 10 years ago
parent
commit
e9c7b5ebf4
1 changed files with 4 additions and 4 deletions
  1. 4
    4
      EditorialModel/components.py

+ 4
- 4
EditorialModel/components.py View File

172
                     c.close()
172
                     c.close()
173
                     if(res != None):
173
                     if(res != None):
174
                         if(new_rank < self.rank):
174
                         if(new_rank < self.rank):
175
-                            req = req.where(getattr(component.c, self.ranked_in) == getattr(self, self.ranked_in) and component.c.rank >= new_rank and component.c.rank < self.rank)
175
+                            req = req.where(getattr(component.c, self.ranked_in) == getattr(self, self.ranked_in), sql.and_( component.c.rank >= new_rank), sql.and_ (component.c.rank < self.rank))
176
                         else:
176
                         else:
177
-                            req = req.where(getattr(component.c, self.ranked_in) == getattr(self, self.ranked_in) and component.c.rank <= new_rank and component.c.rank > self.rank)
177
+                            req = req.where(getattr(component.c, self.ranked_in) == getattr(self, self.ranked_in), sql.and_(component.c.rank <= new_rank), sql.and_ (component.c.rank > self.rank))
178
 
178
 
179
                         c = dbe.connect()
179
                         c = dbe.connect()
180
                         res = c.execute(req)
180
                         res = c.execute(req)
202
                         raise ValueError('new_rank to big, new_rank - 1 doesn\'t exist. new_rank = '+str((new_rank)))
202
                         raise ValueError('new_rank to big, new_rank - 1 doesn\'t exist. new_rank = '+str((new_rank)))
203
                 elif(sign == '+'):
203
                 elif(sign == '+'):
204
                     if(new_rank != 0):
204
                     if(new_rank != 0):
205
-                        req = req.where(getattr(component.c, self.ranked_in) == getattr(self, self.ranked_in) and (component.c.rank <= self.rank + new_rank and component.c.rank > self.rank))
205
+                        req = req.where(getattr(component.c, self.ranked_in) == getattr(self, self.ranked_in), sql.and_(component.c.rank <= self.rank + new_rank), sql.and_ (component.c.rank > self.rank))
206
 
206
 
207
                         c = dbe.connect()
207
                         c = dbe.connect()
208
                         res = c.execute(req)
208
                         res = c.execute(req)
225
                         raise ValueError('Excepted a positive int not a null. new_rank = '+str((new_rank)))
225
                         raise ValueError('Excepted a positive int not a null. new_rank = '+str((new_rank)))
226
                 elif(sign == '-'):
226
                 elif(sign == '-'):
227
                     if(new_rank != 0):
227
                     if(new_rank != 0):
228
-                        req = req.where(getattr(component.c, self.ranked_in) == getattr(self, self.ranked_in) and (component.c.rank >= self.rank - new_rank and component.c.rank < self.rank))
228
+                        req = req.where(getattr(component.c, self.ranked_in) == getattr(self, self.ranked_in), sql.and_ (component.c.rank >= self.rank - new_rank), sql.and_(component.c.rank < self.rank))
229
 
229
 
230
                         c = dbe.connect()
230
                         c = dbe.connect()
231
                         res = c.execute(req)
231
                         res = c.execute(req)

Loading…
Cancel
Save