Revision eeba67ab snf-quotaholder-app/quotaholder_django/quotaholder_app/callpoint.py

b/snf-quotaholder-app/quotaholder_django/quotaholder_app/callpoint.py
39 39
                            DuplicateError)
40 40

  
41 41
from synnefo.lib.commissioning import \
42
    Callpoint, CorruptedError, InvalidDataError
42
    Callpoint, CorruptedError, InvalidDataError, ReturnButFail
43 43
from synnefo.lib.commissioning.utils.newname import newname
44 44

  
45 45
from django.db.models import Q
......
101 101
                e = Entity.objects.create(entity=entity,
102 102
                                          owner=owner,
103 103
                                          key=key)
104

  
105
        if rejected:
106
            raise ReturnButFail(rejected)
104 107
        return rejected
105 108

  
106 109
    def set_entity_key(self, context={}, set_entity_key=()):
......
117 120
            e.key = newkey
118 121
            e.save()
119 122

  
123
        if rejected:
124
            raise ReturnButFail(rejected)
120 125
        return rejected
121 126

  
122 127
    def list_entities(self, context={}, entity=None, key=None):
......
243 248
                h = Holding.objects.create( entity=e, resource=resource,
244 249
                                            policy=p, flags=flags      )
245 250

  
251
        if rejected:
252
            raise ReturnButFail(rejected)
246 253
        return rejected
247 254

  
248 255
    def _init_holding(self, entity, resource, policy,
......
294 301
                                   imported, exported,
295 302
                                   returned, released,
296 303
                                   flags)
304
        if rejected:
305
            raise ReturnButFail(rejected)
297 306
        return rejected
298 307

  
299 308
    def reset_holding(self, context={}, reset_holding=()):
......
325 334
                append(idx)
326 335
                continue
327 336

  
337
        if rejected:
338
            raise ReturnButFail(rejected)
328 339
        return rejected
329 340

  
330 341
    def _check_pending(self, entity, resource):
......
384 395

  
385 396
            h.delete()
386 397

  
398
        if rejected:
399
            raise ReturnButFail(rejected)
387 400
        return rejected
388 401

  
389 402
    def list_resources(self, context={}, entity=None, key=None):
......
489 502
                if p is not None and p.holding_set.count() == 0:
490 503
                    p.delete()
491 504

  
505
        if rejected:
506
            raise ReturnButFail(rejected)
492 507
        return rejected
493 508

  
494 509
    def issue_commission(self,  context     =   {},
......
770 785

  
771 786
            e.delete()
772 787

  
788
        if rejected:
789
            raise ReturnButFail(rejected)
773 790
        return rejected
774 791

  
775 792
    def get_timeline(self, context={}, after="", before="Z", get_timeline=()):

Also available in: Unified diff