Download as
Browse Code »

Commit 872182514a1b5b208080b69f8738f2ddffbefe9c

Authored by Felipe Henrique de Almeida Bormann
1 parent 87d60759
Exists in master and in 3 other branches amadeus_univasf, image-crop, refactoring

modified users url and views to implement login view

Showing 3 changed files with 37 additions and 16 deletions   Show diff stats
users/migrations/0002_auto_20161219_2218.py 0 → 100644
  Diff comments   View file @8721825
... ... @@ -0,0 +1,20 @@
  1 +# -*- coding: utf-8 -*-
  2 +# Generated by Django 1.10 on 2016-12-20 01:18
  3 +from __future__ import unicode_literals
  4 +
  5 +from django.db import migrations, models
  6 +
  7 +
  8 +class Migration(migrations.Migration):
  9 +
  10 + dependencies = [
  11 + ('users', '0001_initial'),
  12 + ]
  13 +
  14 + operations = [
  15 + migrations.AlterField(
  16 + model_name='user',
  17 + name='type_profile',
  18 + field=models.IntegerField(blank=True, choices=[(1, 'Professor'), (2, 'Student'), (3, 'Coordinator')], null=True, verbose_name='Type'),
  19 + ),
  20 + ]
... ...
users/templates/users/login.html
  Diff comments   View file @8721825
... ... @@ -64,17 +64,17 @@
64 64 <button type="submite" class="btn btn-success btn-raised btn-block" form="form-login" style="position: initial;"> {% trans 'Log in' %} </button>
65 65 </div>
66 66 <div class="col-md-5 col-xs-6 col-sm-6 col-lg-5 text-center">
67   - <a class="btn btn-default btn-raised btn-block" href="{% url 'core:guest' %}" formaction="#" style="position: initial;">{% trans 'Guest' %}</a>
  67 + <a class="btn btn-default btn-raised btn-block" href="#" formaction="#" style="position: initial;">{% trans 'Guest' %}</a>
68 68 </div>
69 69 </div>
70 70 <div class="row">
71 71 <div class="col-md-offset-1 col-md-10 text-right forgotPassword">
72   - <a href="{% url 'core:password_reset' %}">{% trans 'Forgot your password?' %}</a>
  72 + <a href="#">{% trans 'Forgot your password?' %}</a>
73 73 </div>
74 74 </div>
75 75 </div>
76 76 </div>
77   - <a class="btn btn-raised btn-primary btn-block" href="{% url 'core:register' %}">{% trans 'Sign Up' %} </a>
  77 + <a class="btn btn-raised btn-primary btn-block" href="#">{% trans 'Sign Up' %} </a>
78 78 </div>
79 79 </div>
80 80  
... ...
users/views.py
  Diff comments   View file @8721825
1   -from django.shortcuts import get_object_or_404,redirect
  1 +from django.shortcuts import get_object_or_404,redirect, render
2 2 from django.db.models import Q
3 3 from django.views import generic
4 4 from django.contrib import messages
... ... @@ -24,7 +24,7 @@ from rest_framework.permissions import IsAuthenticated, IsAuthenticatedOrReadOnl
24 24 class UsersListView(HasRoleMixin, LoginRequiredMixin, generic.ListView):
25 25  
26 26 allowed_roles = ['system_admin']
27   - login_url = reverse_lazy("core:home")
  27 + #login_url = reverse_lazy("core:home")
28 28 redirect_field_name = 'next'
29 29 template_name = 'list_users.html'
30 30 context_object_name = 'users'
... ... @@ -48,7 +48,7 @@ class UsersListView(HasRoleMixin, LoginRequiredMixin, generic.ListView):
48 48 class Create(HasRoleMixin, LoginRequiredMixin, generic.edit.CreateView):
49 49  
50 50 allowed_roles = ['system_admin']
51   - login_url = reverse_lazy("core:home")
  51 + #login_url = reverse_lazy("core:home")
52 52 redirect_field_name = 'next'
53 53 template_name = 'users/create.html'
54 54 form_class = UserForm
... ... @@ -78,7 +78,7 @@ class Create(HasRoleMixin, LoginRequiredMixin, generic.edit.CreateView):
78 78 class Update(HasRoleMixin, LoginRequiredMixin, generic.UpdateView):
79 79  
80 80 allowed_roles = ['system_admin']
81   - login_url = reverse_lazy("core:home")
  81 + #login_url = reverse_lazy("core:home")
82 82 redirect_field_name = 'next'
83 83 template_name = 'users/update.html'
84 84 slug_field = 'username'
... ... @@ -111,7 +111,7 @@ class Update(HasRoleMixin, LoginRequiredMixin, generic.UpdateView):
111 111  
112 112 class View(LoginRequiredMixin, generic.DetailView):
113 113  
114   - login_url = reverse_lazy("core:home")
  114 + #login_url = reverse_lazy("core:home")
115 115 redirect_field_name = 'next'
116 116 model = User
117 117 context_object_name = 'acc'
... ... @@ -134,7 +134,7 @@ def remove_account(request,username):
134 134 user = get_object_or_404(User,username = username)
135 135 user.delete()
136 136 messages.success(request,_("User deleted Successfully!"))
137   - return redirect('core:logout')
  137 + #return redirect('core:logout')
138 138  
139 139 class Change_password(generic.TemplateView):
140 140 template_name = 'users/change_password.html'
... ... @@ -153,7 +153,7 @@ class Remove_account(generic.TemplateView):
153 153 return context
154 154  
155 155 class UpdateProfile(LoginRequiredMixin, generic.edit.UpdateView):
156   - login_url = reverse_lazy("core:home")
  156 + #login_url = reverse_lazy("core:home")
157 157 template_name = 'users/edit_profile.html'
158 158 form_class = UpdateProfileForm
159 159 success_url = reverse_lazy('users:profile')
... ... @@ -178,9 +178,10 @@ class UpdateProfile(LoginRequiredMixin, generic.edit.UpdateView):
178 178  
179 179 class DeleteUser(LoginRequiredMixin, generic.edit.DeleteView):
180 180 allowed_roles = ['student']
181   - login_url = reverse_lazy("core:home")
  181 + #login_url = reverse_lazy("core:home")
182 182 model = User
183   - success_url = reverse_lazy('core:index')
  183 +
  184 + #success_url = reverse_lazy('core:index')
184 185 success_message = "Deleted Successfully"
185 186  
186 187 def get_queryset(self):
... ... @@ -190,7 +191,7 @@ class DeleteUser(LoginRequiredMixin, generic.edit.DeleteView):
190 191  
191 192 class Profile(LoginRequiredMixin, generic.DetailView):
192 193  
193   - login_url = reverse_lazy("core:home")
  194 + #login_url = reverse_lazy("core:home")
194 195 redirect_field_name = 'next'
195 196 context_object_name = 'user'
196 197 template_name = 'users/profile.html'
... ... @@ -206,7 +207,7 @@ class Profile(LoginRequiredMixin, generic.DetailView):
206 207  
207 208 class SearchView(LoginRequiredMixin, generic.ListView):
208 209  
209   - login_url = reverse_lazy("core:home")
  210 + #login_url = reverse_lazy("core:home")
210 211 redirect_field_name = 'next'
211 212 queryset = None
212 213 template_name = 'users/search.html'
... ... @@ -220,7 +221,7 @@ class SearchView(LoginRequiredMixin, generic.ListView):
220 221 return context
221 222  
222 223  
223   -def login(self, request):
  224 +def login(request):
224 225 context = {}
225 226 context['title'] = 'Log In'
226 227  
... ... @@ -237,7 +238,7 @@ def login(self, request):
237 238 elif request.user.is_authenticated:
238 239 return redirect(reverse('users:login'))
239 240  
240   - return render(request,"index.html",context)
  241 + return render(request,"users/login.html",context)
241 242  
242 243 # API VIEWS
243 244  
... ...