91 rql += ' WHERE %s' % ','.join(self.restrictions) |
91 rql += ' WHERE %s' % ','.join(self.restrictions) |
92 return rql |
92 return rql |
93 |
93 |
94 def update_query(self, eid): |
94 def update_query(self, eid): |
95 varmaker = rqlvar_maker() |
95 varmaker = rqlvar_maker() |
96 var = varmaker.next() |
96 var = next(varmaker) |
97 while var in self.kwargs: |
97 while var in self.kwargs: |
98 var = varmaker.next() |
98 var = next(varmaker) |
99 rql = 'SET %s WHERE X eid %%(%s)s' % (','.join(self.edited), var) |
99 rql = 'SET %s WHERE X eid %%(%s)s' % (','.join(self.edited), var) |
100 if self.restrictions: |
100 if self.restrictions: |
101 rql += ', %s' % ','.join(self.restrictions) |
101 rql += ', %s' % ','.join(self.restrictions) |
102 self.kwargs[var] = eid |
102 self.kwargs[var] = eid |
103 return rql |
103 return rql |
314 |
314 |
315 def handle_inlined_relation(self, form, field, values, origvalues, rqlquery): |
315 def handle_inlined_relation(self, form, field, values, origvalues, rqlquery): |
316 """handle edition for the (rschema, x) relation of the given entity |
316 """handle edition for the (rschema, x) relation of the given entity |
317 """ |
317 """ |
318 if values: |
318 if values: |
319 rqlquery.set_inlined(field.name, iter(values).next()) |
319 rqlquery.set_inlined(field.name, next(iter(values))) |
320 elif form.edited_entity.has_eid(): |
320 elif form.edited_entity.has_eid(): |
321 self.handle_relation(form, field, values, origvalues) |
321 self.handle_relation(form, field, values, origvalues) |
322 |
322 |
323 def handle_relation(self, form, field, values, origvalues): |
323 def handle_relation(self, form, field, values, origvalues): |
324 """handle edition for the (rschema, x) relation of the given entity |
324 """handle edition for the (rschema, x) relation of the given entity |
359 entity.cw_delete() |
359 entity.cw_delete() |
360 if len(redirect_info) > 1: |
360 if len(redirect_info) > 1: |
361 # In the face of ambiguity, refuse the temptation to guess. |
361 # In the face of ambiguity, refuse the temptation to guess. |
362 self._after_deletion_path = 'view', () |
362 self._after_deletion_path = 'view', () |
363 else: |
363 else: |
364 self._after_deletion_path = iter(redirect_info).next() |
364 self._after_deletion_path = next(iter(redirect_info)) |
365 if len(eidtypes) > 1: |
365 if len(eidtypes) > 1: |
366 self._cw.set_message(self._cw._('entities deleted')) |
366 self._cw.set_message(self._cw._('entities deleted')) |
367 else: |
367 else: |
368 self._cw.set_message(self._cw._('entity deleted')) |
368 self._cw.set_message(self._cw._('entity deleted')) |
369 |
369 |