entrouvert
/
auquotidien
Archived
17
0
Fork 0
Code Issues Pull Requests Releases Activity

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

... following #13840
This commit is contained in:
Thomas NOËL 2017-03-10 12:39:18 +01:00
parent e191f19e93
commit f2426776ff
2 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
extra/modules/myspace.py
View File

@ -53,11 +53,6 @@ class MyInvoicesDirectory(Directory):
invoices = []
invoices.extend(Invoice.get_with_indexed_value(
str('user_id'), str(user.id)))
try:
invoices.extend(Invoice.get_with_indexed_value(
str('user_hash'), str(user.hash)))
except AttributeError:
pass
def cmp_invoice(a, b):
t = cmp(a.regie_id, b.regie_id)
@ -389,11 +384,6 @@ class JsonDirectory(Directory):
for formdef in formdefs:
user_forms.extend(formdef.data_class().get_with_indexed_value(
'user_id', self.user.id))
try:
user_forms.extend(formdef.data_class().get_with_indexed_value(
'user_hash', self.user.hash))
except AttributeError:
pass
user_forms.sort(lambda x,y: cmp(x.receipt_time, y.receipt_time))
get_response().set_content_type('application/json')
@ -461,11 +451,6 @@ class MyspaceDirectory(wcs.myspace.MyspaceDirectory):
for formdef in formdefs:
user_forms.extend(formdef.data_class().get_with_indexed_value(
'user_id', user.id))
try:
user_forms.extend(formdef.data_class().get_with_indexed_value(
'user_hash', user.hash))
except AttributeError:
pass
user_forms.sort(lambda x,y: cmp(x.receipt_time, y.receipt_time))
profile_links = []

9
extra/modules/payments.py
View File

@ -54,11 +54,10 @@ class Regie(StorableObject):
class Invoice(StorableObject):
_names = 'invoices'
_hashed_indexes = ['user_id', 'user_hash', 'regie_id']
_hashed_indexes = ['user_id', 'regie_id']
_indexes = ['external_id']
user_id = None
user_hash = None
regie_id = None
formdef_id = None
formdata_id = None
@ -270,7 +269,6 @@ class PaymentWorkflowStatusItem(WorkflowStatusItem):
def perform(self, formdata):
invoice = Invoice(regie_id=self.regie_id, formdef_id=formdata.formdef.id)
invoice.user_id = formdata.user_id
invoice.user_hash = formdata.user_hash
invoice.formdata_id = formdata.id
invoice.next_status = self.next_status
if self.subject:
@ -352,9 +350,8 @@ class PaymentCancelWorkflowStatusItem(WorkflowStatusItem):
# select invoices for the selected regie (if not "all regies")
if self.regie_id != '_all':
invoices = [i for i in invoices if i.regie_id == self.regie_id]
# security filter: check user
invoices = [i for i in invoices if (i.user_id == formdata.user_id) \
or (i.user_hash == formdata.user_hash)]
# security filter: check user
invoices = [i for i in invoices if i.user_id == formdata.user_id]
# security filter: check formdata & formdef
invoices = [i for i in invoices if (i.formdata_id == formdata.id) \
and (i.formdef_id == formdata.formdef.id)]