chore(passport): change register to registration

Author: duanhongyi

charts/passport/values.yaml

@@ -15,7 +15,7 @@ environment:
 ## General settings
 #  DRYCC_DEBUG: False
 #  ADMIN_ENABLED: False
-#  REGISTER_ENABLED: False
+#  REGISTRATION_ENABLED: False
 ## LDAP setting
 #  LDAP_ENDPOINT: ""
 #  LDAP_BIND_DN: ""

rootfs/api/serializers.py

@@ -17,7 +17,7 @@
 logger = logging.getLogger(__name__)
 
 
-class RegisterForm(UserCreationForm):
+class RegistrationForm(UserCreationForm):
     class Meta(UserCreationForm.Meta):
         model = User
         fields = ('username', 'email', 'password1', 'password2')

rootfs/api/settings/production.py

@@ -22,9 +22,9 @@
 DEBUG_PROPAGATE_EXCEPTIONS = True
 # Enable Django admin
 ADMIN_ENABLED = bool(os.environ.get('ADMIN_ENABLED', False))
-# Enable Register
+# Enable Registration
 # If this function is enabled, please set Django email related parameters
-REGISTER_ENABLED = bool(os.environ.get('REGISTER_ENABLED', False))
+REGISTRATION_ENABLED = bool(os.environ.get('REGISTRATION_ENABLED', False))
 # Silence two security messages around SSL as router takes care of them
 # https://docs.djangoproject.com/en/2.2/ref/checks/#security
 SILENCED_SYSTEM_CHECKS = [

rootfs/api/templates/user/account_activation_fail.html

@@ -1,5 +1,5 @@
 {% extends 'user/message.html' %}
 {% block title %}Account activite fail{% endblock %}
 {% block message %}
-The confirmation link was invalid, possibly it has already been used, go back <a href="/user/register/">register</a>
+The confirmation link was invalid, possibly it has already been used, go back <a href="/user/registration/">Sign Up</a>
 {% endblock %}

rootfs/api/templates/user/login.html

@@ -26,7 +26,7 @@ <h2 class="h3">Log in to your account</h2>
                 <button class="btn btn-primary btn-lg btn-block" name="commit" type="submit">Log In</button>
                 <input type="hidden" name="next" value={{ next }}>
             </form>
-            <a class="panel-footer" href="/user/register/"><span>Sign Up</span></a>
+            <a class="panel-footer" href="/user/registration/"><span>Sign Up</span></a>
         </div>
         <a href="/user/password_reset/" class="white-link">Forgot your password?</a>
     </div>

rootfs/api/templates/user/register.html …tfs/api/templates/user/registration.htmlrootfs/api/templates/user/register.html renamed to rootfs/api/templates/user/registration.html rootfs/api/templates/user/register.html renamed to rootfs/api/templates/user/registration.html

@@ -10,7 +10,7 @@
 <div class="page-wrap gradient-primary">
     <div class="container">
         <div class="panel">
-            <h2 class="h3">Register</h2>
+            <h2 class="h3">Registration</h2>
             <form method="post">
                 {% csrf_token %}
                 <div class="form-group">

…fs/api/templates/user/register_done.html …pi/templates/user/registration_done.htmlrootfs/api/templates/user/register_done.html renamed to rootfs/api/templates/user/registration_done.html rootfs/api/templates/user/register_done.html renamed to rootfs/api/templates/user/registration_done.html

@@ -1,5 +1,5 @@
 {% extends 'user/message.html' %}
-{% block title %}Register successful{% endblock %}
+{% block title %}Registration successful{% endblock %}
 {% block message %}
 We have sent an email to your mailbox, please log in the email to activate your account.
 {% endblock %}

…fs/api/templates/user/register_fail.html …pi/templates/user/registration_fail.htmlrootfs/api/templates/user/register_fail.html renamed to rootfs/api/templates/user/registration_fail.html rootfs/api/templates/user/register_fail.html renamed to rootfs/api/templates/user/registration_fail.html

@@ -1,5 +1,5 @@
 {% extends 'user/message.html' %}
-{% block title %}Register fail{% endblock %}
+{% block title %}Registration fail{% endblock %}
 {% block message %}
-The registration function of drycc passport is not enabled. Please contact the administrator to register.
+The registration function of drycc passport is not enabled. Please contact the administrator to sign up.
 {% endblock %}

rootfs/api/urls.py

@@ -3,7 +3,7 @@
 from rest_framework.routers import DefaultRouter
 
 from api import views
-from api.views import RegisterView, ActivateAccount, RegisterDoneView, \
+from api.views import RegistrationView, ActivateAccount, RegistrationDoneView, \
     ActivateAccountDoneView, ActivateAccountFailView, LoginDoneView
 
 router = DefaultRouter(trailing_slash=False)
@@ -12,11 +12,11 @@
     re_path(r'^', include(router.urls)),
     re_path(r'^info/?$',
             views.UserDetailView.as_view({'get': 'retrieve', 'put': 'update'})),
-    re_path(r'register/?$', RegisterView.as_view(), name='register'),
+    re_path(r'registration/?$', RegistrationView.as_view(), name='registration'),
     re_path(r'activate/(?P<uidb64>.+)/(?P<token>.+)/?$',
             ActivateAccount.as_view(), name='user_activate_account'),
-    re_path(r'register/done/?$', RegisterDoneView.as_view(),
-            name='user_register_done'),
+    re_path(r'registration/done/?$', RegistrationDoneView.as_view(),
+            name='user_registration_done'),
     re_path(r'activate/done/?$', ActivateAccountDoneView.as_view(),
             name='user_activate_account_done'),
     re_path(r'activate/fail/?$', ActivateAccountFailView.as_view(),

rootfs/api/views.py

@@ -23,7 +23,7 @@
 
 from api import serializers
 from api.exceptions import ServiceUnavailable, DryccException
-from api.serializers import RegisterForm
+from api.serializers import RegistrationForm
 from api.utils import account_activation_token, get_local_host
 from api.viewset import NormalUserViewSet
 
@@ -60,19 +60,19 @@ def get(self, request):
     head = get
 
 
-class RegisterView(CreateView):
-    form_class = RegisterForm
-    template_name = 'user/register.html'
-    success_url = reverse_lazy('register_done')
+class RegistrationView(CreateView):
+    form_class = RegistrationForm
+    template_name = 'user/registration.html'
+    success_url = reverse_lazy('registration_done')
 
     def get(self, request, *args, **kwargs):
-        if settings.LDAP_ENDPOINT or not settings.REGISTER_ENABLED:
-            return render(request, template_name='user/register_fail.html')
+        if settings.LDAP_ENDPOINT or not settings.REGISTRATION_ENABLED:
+            return render(request, template_name='user/registration_fail.html')
         return CreateView.get(self, request, *args, **kwargs)
 
     def post(self, request, *args, **kwargs):
-        if settings.LDAP_ENDPOINT or not settings.REGISTER_ENABLED:
-            return render(request, template_name='user/register_fail.html')
+        if settings.LDAP_ENDPOINT or not settings.REGISTRATION_ENABLED:
+            return render(request, template_name='user/registration_fail.html')
         form = self.form_class(request.POST)
         self.object = None
         if form.is_valid():
@@ -97,8 +97,8 @@ def post(self, request, *args, **kwargs):
             return self.form_invalid(form)
 
 
-class RegisterDoneView(TemplateView):
-    template_name = 'user/register_done.html'
+class RegistrationDoneView(TemplateView):
+    template_name = 'user/registration_done.html'
     title = _('Activate email sent')