From 8bee4fbdd7f17ef46b699137f0c80b0f436094bd Mon Sep 17 00:00:00 2001 From: Jailson Dias Date: Fri, 2 Sep 2016 16:52:25 -0300 Subject: [PATCH] resolve #3 --- amadeus/settings.py | 4 ++-- app/views.py | 2 +- core/templates/index.html | 238 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------------------------------------------------------------------------------------------- core/urls.py | 2 +- courses/views.py | 38 +++++++++++++++++++------------------- users/urls.py | 2 +- users/views.py | 18 +++++++++--------- 7 files changed, 112 insertions(+), 192 deletions(-) diff --git a/amadeus/settings.py b/amadeus/settings.py index 96314c2..53fe606 100644 --- a/amadeus/settings.py +++ b/amadeus/settings.py @@ -142,7 +142,7 @@ MEDIA_URL = '/uploads/' # Users LOGIN_REDIRECT_URL = 'app:index' -LOGIN_URL = 'home' +LOGIN_URL = 'core:home' AUTH_USER_MODEL = 'users.User' AUTHENTICATION_BACKENDS = [ 'django.contrib.auth.backends.ModelBackend', @@ -150,4 +150,4 @@ AUTHENTICATION_BACKENDS = [ ROLEPERMISSIONS_MODULE = 'amadeus.roles' -#https://github.com/squ1b3r/Djaneiro \ No newline at end of file +#https://github.com/squ1b3r/Djaneiro diff --git a/app/views.py b/app/views.py index 3ba9e48..d1a53f2 100644 --- a/app/views.py +++ b/app/views.py @@ -9,4 +9,4 @@ def index(request): context['courses'] = Course.objects.filter(user = request.user) - return render(request, "home_app.html", context) \ No newline at end of file + return render(request, "home_app.html", context) diff --git a/core/templates/index.html b/core/templates/index.html index c6bbcc6..c507139 100644 --- a/core/templates/index.html +++ b/core/templates/index.html @@ -3,165 +3,85 @@ {% load static i18n %} {% load widget_tweaks %} -{% block sidebar %} -
- {% csrf_token %} - - {% for error in form.non_field_errors %} -
- {{ error }} -
- {% endfor %} - - {% for field in form %} -
- -
- {% render_field field class='form-control input-sm' %} - {% for error in field.errors %} - {{ error }} - {% endfor %} -
-
- {% endfor %} -
-
- -
-
-
+{% block style %} + + + + + + + +{% endblock %} + + +{% block javascript %} + + + + + + {% endblock %} + {% block content %} -
-
-
-
-
- -
- -
-
-
- -
- -
- -
{% trans 'Most popular keywords:' %}
-
-
- -
-
-
-
- -{% endblock %} \ No newline at end of file +
+
+ logo amadeus +
+
+ +
+
+
+
+ +
+
+ {% csrf_token %} + +
+ +
+ +
+ + +
+ +
+
+
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+
+
+
+ + +
+ +
+{% endblock%} diff --git a/core/urls.py b/core/urls.py index f5a8a9d..38619a1 100644 --- a/core/urls.py +++ b/core/urls.py @@ -6,5 +6,5 @@ from . import views urlpatterns = [ url(r'^$', views.index, name='index'), url(r'^login/$', auth_views.login, {'template_name': 'index.html'}, name='home'), - url(r'^logout/$', auth_views.logout, {'next_page': 'home'}, name='logout'), + url(r'^logout/$', auth_views.logout, {'next_page': 'core:home'}, name='logout'), ] diff --git a/courses/views.py b/courses/views.py index dda5933..d52063a 100644 --- a/courses/views.py +++ b/courses/views.py @@ -35,7 +35,7 @@ class CreateView(LoginRequiredMixin, HasRoleMixin, generic.edit.CreateView): redirect_field_name = 'next' template_name = 'course/create.html' form_class = CourseForm - success_url = reverse_lazy('app:course:manage') + success_url = reverse_lazy('course:manage') def form_valid(self, form): self.object = form.save(commit = False) @@ -46,7 +46,7 @@ class CreateView(LoginRequiredMixin, HasRoleMixin, generic.edit.CreateView): def render_to_response(self, context, **response_kwargs): messages.success(self.request, _('Course created successfully!')) - + return self.response_class(request=self.request, template=self.get_template_names(), context=context, using=self.template_engine) class UpdateView(LoginRequiredMixin, HasRoleMixin, generic.UpdateView): @@ -57,7 +57,7 @@ class UpdateView(LoginRequiredMixin, HasRoleMixin, generic.UpdateView): template_name = 'course/update.html' model = Course form_class = CourseForm - success_url = reverse_lazy('app:course:manage') + success_url = reverse_lazy('course:manage') def form_valid(self, form): self.object = form.save(commit = False) @@ -68,7 +68,7 @@ class UpdateView(LoginRequiredMixin, HasRoleMixin, generic.UpdateView): def render_to_response(self, context, **response_kwargs): messages.success(self.request, _('Course edited successfully!')) - + return self.response_class(request=self.request, template=self.get_template_names(), context=context, using=self.template_engine) class View(LoginRequiredMixin, generic.DetailView): @@ -86,11 +86,11 @@ class DeleteView(LoginRequiredMixin, HasRoleMixin, generic.DeleteView): redirect_field_name = 'next' model = Course template_name = 'course/delete.html' - success_url = reverse_lazy('app:course:manage') + success_url = reverse_lazy('course:manage') def render_to_response(self, context, **response_kwargs): messages.success(self.request, _('Course deleted successfully!')) - + return self.response_class(request=self.request, template=self.get_template_names(), context=context, using=self.template_engine) class FilteredView(LoginRequiredMixin, generic.ListView): @@ -129,7 +129,7 @@ class CreateCatView(LoginRequiredMixin, HasRoleMixin, generic.edit.CreateView): redirect_field_name = 'next' template_name = 'category/create.html' form_class = CategoryForm - success_url = reverse_lazy('app:course:manage_cat') + success_url = reverse_lazy('course:manage_cat') def form_valid(self, form): self.object = form.save(commit = False) @@ -140,7 +140,7 @@ class CreateCatView(LoginRequiredMixin, HasRoleMixin, generic.edit.CreateView): def render_to_response(self, context, **response_kwargs): messages.success(self.request, _('Category created successfully!')) - + return self.response_class(request=self.request, template=self.get_template_names(), context=context, using=self.template_engine) class UpdateCatView(LoginRequiredMixin, HasRoleMixin, generic.UpdateView): @@ -151,7 +151,7 @@ class UpdateCatView(LoginRequiredMixin, HasRoleMixin, generic.UpdateView): template_name = 'category/update.html' model = Category form_class = CategoryForm - success_url = reverse_lazy('app:course:manage_cat') + success_url = reverse_lazy('course:manage_cat') def form_valid(self, form): self.object = form.save(commit = False) @@ -162,7 +162,7 @@ class UpdateCatView(LoginRequiredMixin, HasRoleMixin, generic.UpdateView): def render_to_response(self, context, **response_kwargs): messages.success(self.request, _('Category edited successfully!')) - + return self.response_class(request=self.request, template=self.get_template_names(), context=context, using=self.template_engine) class ViewCat(LoginRequiredMixin, generic.DetailView): @@ -173,17 +173,17 @@ class ViewCat(LoginRequiredMixin, generic.DetailView): context_object_name = 'category' class DeleteCatView(LoginRequiredMixin, HasRoleMixin, generic.DeleteView): - + allowed_roles = ['professor', 'system_admin'] login_url = '/' redirect_field_name = 'next' model = Category template_name = 'category/delete.html' - success_url = reverse_lazy('app:course:manage_cat') + success_url = reverse_lazy('course:manage_cat') def render_to_response(self, context, **response_kwargs): messages.success(self.request, _('Category deleted successfully!')) - + return self.response_class(request=self.request, template=self.get_template_names(), context=context, using=self.template_engine) class ModulesView(LoginRequiredMixin, generic.ListView): @@ -214,7 +214,7 @@ class CreateModView(LoginRequiredMixin, HasRoleMixin, generic.edit.CreateView): form_class = ModuleForm def get_success_url(self): - return reverse_lazy('app:course:manage_mods', kwargs={'slug' : self.object.course.slug}) + return reverse_lazy('course:manage_mods', kwargs={'slug' : self.object.course.slug}) def get_context_data(self, **kwargs): course = get_object_or_404(Course, slug = self.kwargs.get('slug')) @@ -235,7 +235,7 @@ class CreateModView(LoginRequiredMixin, HasRoleMixin, generic.edit.CreateView): def render_to_response(self, context, **response_kwargs): messages.success(self.request, _('Module created successfully!')) - + return self.response_class(request=self.request, template=self.get_template_names(), context=context, using=self.template_engine) class UpdateModView(LoginRequiredMixin, HasRoleMixin, generic.UpdateView): @@ -248,7 +248,7 @@ class UpdateModView(LoginRequiredMixin, HasRoleMixin, generic.UpdateView): form_class = ModuleForm def get_success_url(self): - return reverse_lazy('app:course:manage_mods', kwargs={'slug' : self.object.course.slug}) + return reverse_lazy('course:manage_mods', kwargs={'slug' : self.object.course.slug}) def get_context_data(self, **kwargs): course = get_object_or_404(Course, slug = self.kwargs.get('slug_course')) @@ -266,7 +266,7 @@ class UpdateModView(LoginRequiredMixin, HasRoleMixin, generic.UpdateView): def render_to_response(self, context, **response_kwargs): messages.success(self.request, _('Module edited successfully!')) - + return self.response_class(request=self.request, template=self.get_template_names(), context=context, using=self.template_engine) class DeleteModView(LoginRequiredMixin, HasRoleMixin, generic.DeleteView): @@ -278,7 +278,7 @@ class DeleteModView(LoginRequiredMixin, HasRoleMixin, generic.DeleteView): template_name = 'module/delete.html' def get_success_url(self): - return reverse_lazy('app:course:manage_mods', kwargs={'slug' : self.object.course.slug}) + return reverse_lazy('course:manage_mods', kwargs={'slug' : self.object.course.slug}) def get_context_data(self, **kwargs): course = get_object_or_404(Course, slug = self.kwargs.get('slug_course')) @@ -289,5 +289,5 @@ class DeleteModView(LoginRequiredMixin, HasRoleMixin, generic.DeleteView): def render_to_response(self, context, **response_kwargs): messages.success(self.request, _('Module deleted successfully!')) - + return self.response_class(request=self.request, template=self.get_template_names(), context=context, using=self.template_engine) diff --git a/users/urls.py b/users/urls.py index 17f7d73..c336720 100644 --- a/users/urls.py +++ b/users/urls.py @@ -9,4 +9,4 @@ urlpatterns = [ url(r'^usuario/dados/(?P[\w_-]+)/$', views.View.as_view(), name='view'), url(r'^perfil/$', views.Profile.as_view(), name='profile'), url(r'^perfil/editar/$', views.EditProfile.as_view(), name='edit_profile'), -] \ No newline at end of file +] diff --git a/users/views.py b/users/views.py index 3db60a3..ea5542f 100644 --- a/users/views.py +++ b/users/views.py @@ -10,7 +10,7 @@ from .models import User from .forms import UserForm, ProfileForm class UsersListView(HasRoleMixin, LoginRequiredMixin, generic.ListView): - + allowed_roles = ['system_admin'] login_url = '/' redirect_field_name = 'next' @@ -30,7 +30,7 @@ class Create(HasRoleMixin, LoginRequiredMixin, generic.edit.CreateView): template_name = 'users/create.html' form_class = UserForm context_object_name = 'acc' - success_url = reverse_lazy('app:user:manage') + success_url = reverse_lazy('user:manage') def form_valid(self, form): self.object = form.save(commit = False) @@ -59,11 +59,11 @@ class Update(HasRoleMixin, LoginRequiredMixin, generic.UpdateView): context_object_name = 'acc' model = User form_class = UserForm - success_url = reverse_lazy('app:users:manage') + success_url = reverse_lazy('users:manage') def form_valid(self, form): self.object = form.save(commit = False) - + if self.object.type_profile == 2: assign_role(self.object, 'student') elif self.object.type_profile == 1: @@ -72,11 +72,11 @@ class Update(HasRoleMixin, LoginRequiredMixin, generic.UpdateView): assign_role(self.object, 'system_admin') self.object.save() - + messages.success(self.request, _('User edited successfully!')) return super(Update, self).form_valid(form) - + class View(LoginRequiredMixin, generic.DetailView): login_url = '/' @@ -96,7 +96,7 @@ class Profile(LoginRequiredMixin, generic.DetailView): def get_object(self): user = get_object_or_404(User, username = self.request.user.username) - return user + return user class EditProfile(LoginRequiredMixin, generic.UpdateView): @@ -112,7 +112,7 @@ class EditProfile(LoginRequiredMixin, generic.UpdateView): def form_valid(self, form): self.object = form.save(commit = False) - + if self.object.type_profile == 2: assign_role(self.object, 'student') elif self.object.type_profile == 1: @@ -124,4 +124,4 @@ class EditProfile(LoginRequiredMixin, generic.UpdateView): messages.success(self.request, _('Profile edited successfully!')) - return super(EditProfile, self).form_valid(form) \ No newline at end of file + return super(EditProfile, self).form_valid(form) -- libgit2 0.21.2