8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-12-25 00:13:45 +00:00
Commit graph

329 commits

Author SHA1 Message Date
grisel-davy
eaf3673587 Don't know why, but it solves issue #281 2021-01-24 16:37:09 +01:00
grisel-davy
7ac894c168 Replace null by 0 in default value of duration_* 2021-01-24 16:37:09 +01:00
grisel-davy
baadaa18f9 Fix the test for ventes in the set_active function. This function could be greatly improved if the duraction could not be null. 2021-01-24 16:36:51 +01:00
Gabriel Detraz
8190101c0a Fix query test for set_active function 2021-01-24 16:36:17 +01:00
grisel-davy
5673b199c5 split query into two filters 2021-01-24 16:36:16 +01:00
histausse
b317eceec3 Split the membership duration from the connection duration
changes:

Article:
remove COTISATION_TYPE, duration(_days), type_cotisation
add duration(_days)_connection, duration(_days)_membership

Vente:
remove COTISATION_TYPE, duration(_days), type_cotisation
add duration(_days)_connection, duration(_days)_membership
add method `test_membership_or_connection()` to replace
`bool(type_cotisation)`

Cotisation:
remove COTISATION_TYPE, date_start, date_end, type_cotisation
add date_start_con, date_end_con, date_start_memb, date_end_memb

create_cotis(date_start=False) -> create_cotis(date_start_con=False, date_start_memb=False)

+ migration
+ changes to use the new models in the remaining of the code
2021-01-24 16:36:16 +01:00
Gabriel Detraz
d5831c5f1f The reset_passw function should not set as not yet active users that have already been flaged active 2021-01-24 16:36:16 +01:00
Gabriel Detraz
2d6d1a6024 Fix acl on check pseudo change by user 2021-01-24 16:36:16 +01:00
Gabriel Detraz
7824083a55 Translation of user app views + remove trailing spaces 2021-01-24 16:36:16 +01:00
Gabriel Detraz
564851feda Final translation of users app 2021-01-24 16:36:16 +01:00
Leila
b2607ab232 Add thumbnail to user model 2021-01-24 16:36:16 +01:00
Gabriel Detraz
abbcf4a1de Rename rezo_rez_uid legacy and add some help text entries 2021-01-24 16:36:16 +01:00
Gabriel Detraz
69c924014f Fix permission check 2021-01-24 16:33:32 +01:00
Gabriel Detraz
bcb9e097ac Add self pseudo setting 2021-01-24 16:33:32 +01:00
5eb89e85ba Improve comments for User clean methods 2021-01-24 16:33:32 +01:00
Gabriel Detraz
dc67ed5298 Check email in user clean (factorise code) 2021-01-24 16:33:32 +01:00
1755f6e624 Prevent user email from being null 2021-01-24 16:33:32 +01:00
259e9eff51 Leave user email blank / null for compatilibity 2021-01-24 16:33:32 +01:00
8befbb8ad8 Handle empty emails 2021-01-24 16:33:32 +01:00
b968f23b65 Leave user email blank / null for compatilibity 2021-01-24 16:33:32 +01:00
9e1cd17a1b Handle empty emails 2021-01-24 16:33:32 +01:00
00c15b4bb9 Move mail util function to seperate file 2021-01-24 16:33:31 +01:00
91504e9688 Fix circular import of utils 2021-01-24 16:33:31 +01:00
cb9ae34418 Make emails throw timeout errors, and gracefully handle them 2021-01-24 16:33:31 +01:00
Gabriel Detraz
4490f75dd4 Simplify preferences, add all_room acl for users 2021-01-24 16:33:31 +01:00
Gabriel Detraz
2f7c77fd9f Fix #247 2021-01-24 16:33:31 +01:00
2ed3b2ac31 Fix translations 2021-01-24 16:33:31 +01:00
179b8cfd26 Make email translations more consistent 2021-01-24 16:33:31 +01:00
Gabriel Detraz
d2881c64dc Don't forget to save 2021-01-24 16:33:31 +01:00
Gabriel Detraz
fb5c215f47 Allow admin to modify email state 2021-01-24 16:33:31 +01:00
cdd9dfae6c Provide default value for email_change_date and don't allow it to be null 2021-01-24 16:33:31 +01:00
154096050c Make send_confirm_email_if_necessary clearer 2021-01-24 16:33:31 +01:00
5fdb8a7b1e Fix wrong state check in send_confirm_email_if_necessary 2021-01-24 16:33:31 +01:00
1c65dc50ff Don't set User.email_change_date to None 2021-01-24 16:33:31 +01:00
def91bff7a Call user.confirm_mail in UserManager._create_user 2021-01-24 16:33:31 +01:00
216d14bb25 Ensure confirmation email tokens are deleted if no longer valid 2021-01-24 16:33:31 +01:00
9f1c6a57e2 Correctly send a confirmation email 2021-01-24 16:33:31 +01:00
1a997f81ee Add missing __original_email init 2021-01-24 16:33:31 +01:00
db620e9c90 Always send confirmation email, except for fully-archived users 2021-01-24 16:33:31 +01:00
9fe4313540 Move some code away from the forms 2021-01-24 16:33:31 +01:00
8e543a04b1 Fix marking email as verified 2021-01-24 16:33:31 +01:00
ba7fe6e035 Automatically validate superuer's email address 2021-01-24 16:33:31 +01:00
4803417bca Replace STATE_EMAIL_NOT_YET_CONFIRMED with an email_state 2021-01-24 16:33:31 +01:00
Jean-Romain Garnier
81b6b999be Revert "Create STATE_SUSPENDED"
This reverts commit 2aef2ae3fa.
2021-01-24 16:33:31 +01:00
Jean-Romain Garnier
47772f1464 Revert "Allow suspended users to login"
This reverts commit 91c51c50df.
2021-01-24 16:33:31 +01:00
bcb22f1382 Allow suspended users to login 2021-01-24 16:33:31 +01:00
0dcd8b79e2 Create STATE_SUSPENDED 2021-01-24 16:33:31 +01:00
Gabriel Detraz
ffdb32df90 Update headers 2021-01-24 16:33:31 +01:00
c71c41fea8 Notify users of suspension when they failed to confirm their email 2021-01-24 16:33:31 +01:00
0c1cf9ac94 Improve various templates related to email confirmation 2021-01-24 16:33:31 +01:00