Removed 'Register' step from navbar

Now to access this step the user must be authenticated and in need to update its main data Signed-off-by: Carlos Oliveira <carlospecter@gmail.com>

Removed 'Register' step from navbar
Now to access this step the user must be authenticated and in need to update its main data Signed-off-by: Carlos Oliveira <carlospecter@gmail.com>
Carlos Coêlho · Sergio Oliveira
1 parent 44dd3d4a
Showing 2 changed files with 15 additions and 7 deletions Show diff stats
colab/accounts/views.py
colab/templates/base.html
@@ -123,6 +123,16 @@ class UserProfileDetailView(UserProfileBaseMixin, DetailView):
 def signup(request):
+    user = request.user
+
+    # If the user is not authenticated, redirect to login
+    if not user.is_authenticated():
+        return redirect('login')
+
+    # If the user doesn't need to update its main data, redirect to its profile
+    if not user.needs_update:
+        return redirect('user_profile', username=user.username)
+
     # If the request method is GET just return the form
     if request.method == 'GET':
         user_form = UserCreationForm()
@@ -119,28 +119,28 @@
             {% if proxy.noosfero %}
               <li class="dropdown">
                 <a href="#" class="dropdown-toggle" data-toggle="dropdown">
-                  {% trans "Social" %} <b class="caret"></b> 
+                  {% trans "Social" %} <b class="caret"></b>
                 </a>
                 <ul class="dropdown-menu">
                   <li>
                     <a href="/social/search/people">
-                      {% trans "Users" %} 
+                      {% trans "Users" %}
                     </a>
                   </li>
                   <li>
                     <a href="/social/search/communities">
-                      {% trans "Communities" %} 
+                      {% trans "Communities" %}
                     </a>
                   </li>
                   {% if user.is_active %}
                   <li>
                     <a href="/social/profile/{{ user.username }}">
-                      {% trans "Profile" %} 
+                      {% trans "Profile" %}
                     </a>
                   </li>
                   <li>
                     <a href="/social/myprofile/{{ user.username }}">
-                      {% trans "Control panel" %} 
+                      {% trans "Control panel" %}
                     </a>
                   </li>
                 {% endif %}
@@ -180,12 +180,10 @@
               <li class="dropdown hidden-xs hidden-lg">
                 <a href="#" class="dropdown-toggle" data-toggle="dropdown">Acesso <b class="caret"></b></a>
                 <ul class="dropdown-menu">
-                  <li><a href="{% url 'signup' %}">{% trans "Register" %}</a></li>
                   {% trans 'Login' as login_text %}
                   <li>{% browserid_login text=login_text %}</li>
                 </ul>
               </li>
-              <li class="visible-xs hidden-sm hidden-md"><a href="{% url 'signup' %}">{% trans "Register" %}</a></li>
               {% trans 'Login' as login_text %}
               <li class="visible-xs hidden-sm hidden-md">{% browserid_login text=login_text %}</li>
             {% else %}
	@@ -123,6 +123,16 @@ class UserProfileDetailView(UserProfileBaseMixin, DetailView):		@@ -123,6 +123,16 @@ class UserProfileDetailView(UserProfileBaseMixin, DetailView):
123		123
124		124
125	def signup(request):	125	def signup(request):
		126	+ user = request.user
		127	+
		128	+ # If the user is not authenticated, redirect to login
		129	+ if not user.is_authenticated():
		130	+ return redirect('login')
		131	+
		132	+ # If the user doesn't need to update its main data, redirect to its profile
		133	+ if not user.needs_update:
		134	+ return redirect('user_profile', username=user.username)
		135	+
126	# If the request method is GET just return the form	136	# If the request method is GET just return the form
127	if request.method == 'GET':	137	if request.method == 'GET':
128	user_form = UserCreationForm()	138	user_form = UserCreationForm()