Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
nk20
Manage
Activity
Members
Labels
Plan
Issues
32
Issue boards
Milestones
Wiki
Code
Merge requests
5
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
BDE
nk20
Commits
f2baeedc
Commit
f2baeedc
authored
5 years ago
by
ynerant
Browse files
Options
Downloads
Patches
Plain Diff
Add basic roles for BDE and Kfet
parent
ff820ef0
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!73
Inscriptions
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
apps/registration/views.py
+7
-3
7 additions, 3 deletions
apps/registration/views.py
locale/fr/LC_MESSAGES/django.po
+5
-5
5 additions, 5 deletions
locale/fr/LC_MESSAGES/django.po
with
12 additions
and
8 deletions
apps/registration/views.py
+
7
−
3
View file @
f2baeedc
...
...
@@ -15,7 +15,7 @@ from django.views.decorators.csrf import csrf_protect
from
django.views.generic
import
CreateView
,
TemplateView
,
DetailView
,
FormView
from
django_tables2
import
SingleTableView
from
member.forms
import
ProfileForm
from
member.models
import
Membership
,
Club
from
member.models
import
Membership
,
Club
,
Role
from
note.models
import
SpecialTransaction
,
NoteSpecial
from
note.templatetags.pretty_money
import
pretty_money
from
permission.backends
import
PermissionBackend
...
...
@@ -262,18 +262,22 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView,
)
if
join_BDE
:
Membership
.
objects
.
create
(
membership
=
Membership
.
objects
.
create
(
club
=
bde
,
user
=
user
,
fee
=
bde_fee
,
)
membership
.
roles
.
add
(
Role
.
objects
.
get
(
name
=
"
Adhérent BDE
"
))
membership
.
save
()
if
join_Kfet
:
Membership
.
objects
.
create
(
membership
=
Membership
.
objects
.
create
(
club
=
kfet
,
user
=
user
,
fee
=
kfet_fee
,
)
membership
.
roles
.
add
(
Role
.
objects
.
get
(
name
=
"
Adhérent Kfet
"
))
membership
.
save
()
return
ret
...
...
This diff is collapsed.
Click to expand it.
locale/fr/LC_MESSAGES/django.po
+
5
−
5
View file @
f2baeedc
...
...
@@ -1135,12 +1135,12 @@ msgstr "Gérer les jetons d'authentification"
#: templates/member/profile_tables.html:7
#: templates/registration/future_profile_detail.html:28
msgid "This user doesn't have confirmed his/her e-mail address."
msgstr ""
msgstr "
Cet utilisateur n'a pas encore confirmé son adresse e-mail.
"
#: templates/member/profile_tables.html:8
#: templates/registration/future_profile_detail.html:29
msgid "Click here to resend a validation link."
msgstr ""
msgstr "
Cliquez ici pour renvoyer un lien de validation.
"
#: templates/member/profile_tables.html:18
msgid "View my memberships"
...
...
@@ -1247,15 +1247,15 @@ msgstr ""
#: templates/registration/future_profile_detail.html:56
msgid "Delete registration"
msgstr ""
msgstr "
Supprimer l'inscription
"
#: templates/registration/future_profile_detail.html:64
msgid "Validate account"
msgstr ""
msgstr "
Valider le compte
"
#: templates/registration/future_profile_detail.html:71
msgid "Validate registration"
msgstr ""
msgstr "
Valider l'inscription
"
#: templates/registration/future_user_list.html:7
msgid "New user"
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment