Projet

Général

Profil

« Précédent | Suivant » 

Révision f2426776

Ajouté par Thomas Noël il y a environ 7 ans

general: remove "user hash" stuff (#15374)

... following #13840

Voir les différences:

extra/modules/myspace.py
53 53
        invoices = []
54 54
        invoices.extend(Invoice.get_with_indexed_value(
55 55
            str('user_id'), str(user.id)))
56
        try:
57
            invoices.extend(Invoice.get_with_indexed_value(
58
                str('user_hash'), str(user.hash)))
59
        except AttributeError:
60
            pass
61 56

  
62 57
        def cmp_invoice(a, b):
63 58
            t = cmp(a.regie_id, b.regie_id)
......
389 384
        for formdef in formdefs:
390 385
            user_forms.extend(formdef.data_class().get_with_indexed_value(
391 386
                        'user_id', self.user.id))
392
            try:
393
                user_forms.extend(formdef.data_class().get_with_indexed_value(
394
                        'user_hash', self.user.hash))
395
            except AttributeError:
396
                pass
397 387
        user_forms.sort(lambda x,y: cmp(x.receipt_time, y.receipt_time))
398 388

  
399 389
        get_response().set_content_type('application/json')
......
461 451
            for formdef in formdefs:
462 452
                user_forms.extend(formdef.data_class().get_with_indexed_value(
463 453
                            'user_id', user.id))
464
                try:
465
                    user_forms.extend(formdef.data_class().get_with_indexed_value(
466
                            'user_hash', user.hash))
467
                except AttributeError:
468
                    pass
469 454
            user_forms.sort(lambda x,y: cmp(x.receipt_time, y.receipt_time))
470 455

  
471 456
        profile_links = []
extra/modules/payments.py
54 54

  
55 55
class Invoice(StorableObject):
56 56
    _names = 'invoices'
57
    _hashed_indexes = ['user_id', 'user_hash', 'regie_id']
57
    _hashed_indexes = ['user_id', 'regie_id']
58 58
    _indexes = ['external_id']
59 59

  
60 60
    user_id = None
61
    user_hash = None
62 61
    regie_id = None
63 62
    formdef_id = None
64 63
    formdata_id = None
......
270 269
    def perform(self, formdata):
271 270
        invoice = Invoice(regie_id=self.regie_id, formdef_id=formdata.formdef.id)
272 271
        invoice.user_id = formdata.user_id
273
        invoice.user_hash = formdata.user_hash
274 272
        invoice.formdata_id = formdata.id
275 273
        invoice.next_status = self.next_status
276 274
        if self.subject:
......
352 350
        # select invoices for the selected regie (if not "all regies")
353 351
        if self.regie_id != '_all':
354 352
            invoices = [i for i in invoices if i.regie_id == self.regie_id]
355
        # security filter: check user 
356
        invoices = [i for i in invoices if (i.user_id == formdata.user_id) \
357
                or (i.user_hash == formdata.user_hash)]
353
        # security filter: check user
354
        invoices = [i for i in invoices if i.user_id == formdata.user_id]
358 355
        # security filter: check formdata & formdef
359 356
        invoices = [i for i in invoices if (i.formdata_id == formdata.id) \
360 357
                and (i.formdef_id == formdata.formdef.id)]

Formats disponibles : Unified diff