Commit 06909be059f94ed5a06f4ebab3ac9fa0be4fcf55
Exists in
master
and in
5 other branches
Fixing conflit
Showing
5 changed files
with
38 additions
and
8 deletions
Show diff stats
courses/templates/subject/form_view_student.html
forum/static/js/forum.js
| @@ -57,7 +57,9 @@ function createForum(url, topic) { | @@ -57,7 +57,9 @@ function createForum(url, topic) { | ||
| 57 | $(".forum_form").html(data); | 57 | $(".forum_form").html(data); |
| 58 | $("#id_topic").val(topic); | 58 | $("#id_topic").val(topic); |
| 59 | 59 | ||
| 60 | - $('.date-picker').datepicker(); | 60 | + $('.date-picker').datepicker({ |
| 61 | + format: 'dd/mm/yyyy', | ||
| 62 | + }); | ||
| 61 | 63 | ||
| 62 | var frm = $('#forum_create'); | 64 | var frm = $('#forum_create'); |
| 63 | frm.submit(function () { | 65 | frm.submit(function () { |
| @@ -92,15 +94,16 @@ function createForum(url, topic) { | @@ -92,15 +94,16 @@ function createForum(url, topic) { | ||
| 92 | * Function to load edit forum's form and set the submit function | 94 | * Function to load edit forum's form and set the submit function |
| 93 | * | 95 | * |
| 94 | */ | 96 | */ |
| 95 | -function editForum(url, forum) { | 97 | +function editForum(url, forum, success_message) { |
| 96 | $.ajax({ | 98 | $.ajax({ |
| 97 | url: url, | 99 | url: url, |
| 98 | data: {'pk': forum}, | 100 | data: {'pk': forum}, |
| 99 | success: function(data) { | 101 | success: function(data) { |
| 100 | $(".forum_form").html(data); | 102 | $(".forum_form").html(data); |
| 101 | - //$("#id_topic").val(topic); | ||
| 102 | 103 | ||
| 103 | - $('.date-picker').datepicker(); | 104 | + $('.date-picker').datepicker({ |
| 105 | + format: 'dd/mm/yyyy', | ||
| 106 | + }); | ||
| 104 | 107 | ||
| 105 | var frm = $('#forum_create'); | 108 | var frm = $('#forum_create'); |
| 106 | frm.submit(function () { | 109 | frm.submit(function () { |
| @@ -111,6 +114,8 @@ function editForum(url, forum) { | @@ -111,6 +114,8 @@ function editForum(url, forum) { | ||
| 111 | success: function (data) { | 114 | success: function (data) { |
| 112 | $('.forum_view').html(data); | 115 | $('.forum_view').html(data); |
| 113 | 116 | ||
| 117 | + alertify.success(success_message); | ||
| 118 | + | ||
| 114 | $("#editForum").modal('hide'); | 119 | $("#editForum").modal('hide'); |
| 115 | }, | 120 | }, |
| 116 | error: function(data) { | 121 | error: function(data) { |
forum/templates/forum/forum_view.html
| @@ -41,7 +41,7 @@ | @@ -41,7 +41,7 @@ | ||
| 41 | </div> | 41 | </div> |
| 42 | <div class="panel-body"> | 42 | <div class="panel-body"> |
| 43 | <ul class="nav nav-pills nav-stacked"> | 43 | <ul class="nav nav-pills nav-stacked"> |
| 44 | - <li><a href="javascript:editForum('{% url 'course:forum:update' forum.id %}', '{{ forum.id }}')">{% trans 'Edit' %}</a></li> | 44 | + <li><a href="javascript:editForum('{% url 'course:forum:update' forum.id %}', '{{ forum.id }}', '{% trans 'Forum edited successfully!' %}')">{% trans 'Edit' %}</a></li> |
| 45 | <li><a href="javascript:delete_forum('{% url 'course:forum:delete' forum.id %}', '{{ forum.id }}', '{% trans "Are you sure you want to delete this forum?" %}', '{% url 'course:view_subject' forum.topic.subject.slug %}')">{% trans 'Delete' %}</a></li> | 45 | <li><a href="javascript:delete_forum('{% url 'course:forum:delete' forum.id %}', '{{ forum.id }}', '{% trans "Are you sure you want to delete this forum?" %}', '{% url 'course:view_subject' forum.topic.subject.slug %}')">{% trans 'Delete' %}</a></li> |
| 46 | </ul> | 46 | </ul> |
| 47 | </div> | 47 | </div> |
users/admin.py
| 1 | from django.contrib import admin | 1 | from django.contrib import admin |
| 2 | from .models import User | 2 | from .models import User |
| 3 | -from .forms import UserForm | 3 | +from .forms import AdminUserForm |
| 4 | 4 | ||
| 5 | class UserAdmin(admin.ModelAdmin): | 5 | class UserAdmin(admin.ModelAdmin): |
| 6 | list_display = ['username', 'name', 'email', 'is_staff', 'is_active'] | 6 | list_display = ['username', 'name', 'email', 'is_staff', 'is_active'] |
| 7 | search_fields = ['username', 'name', 'email'] | 7 | search_fields = ['username', 'name', 'email'] |
| 8 | - # form = UserForm | 8 | + form = AdminUserForm |
| 9 | 9 | ||
| 10 | admin.site.register(User, UserAdmin) | 10 | admin.site.register(User, UserAdmin) |
| 11 | \ No newline at end of file | 11 | \ No newline at end of file |
users/forms.py
| @@ -10,6 +10,31 @@ from django.contrib.auth.forms import UserCreationForm | @@ -10,6 +10,31 @@ from django.contrib.auth.forms import UserCreationForm | ||
| 10 | from core.forms import RegisterUserForm | 10 | from core.forms import RegisterUserForm |
| 11 | from .models import User | 11 | from .models import User |
| 12 | 12 | ||
| 13 | +class AdminUserForm(forms.ModelForm): | ||
| 14 | + def save(self, commit=True): | ||
| 15 | + super(AdminUserForm, self).save(commit=False) | ||
| 16 | + | ||
| 17 | + self.instance.set_password(self.cleaned_data['password']) | ||
| 18 | + self.instance.save() | ||
| 19 | + | ||
| 20 | + if self.instance.is_staff: | ||
| 21 | + assign_role(self.instance, 'system_admin') | ||
| 22 | + elif self.instance.type_profile == 2: | ||
| 23 | + assign_role(self.instance, 'student') | ||
| 24 | + elif self.instance.type_profile == 1: | ||
| 25 | + assign_role(self.instance, 'professor') | ||
| 26 | + | ||
| 27 | + self.instance.save() | ||
| 28 | + | ||
| 29 | + return self.instance | ||
| 30 | + | ||
| 31 | + class Meta: | ||
| 32 | + model = User | ||
| 33 | + fields = ['username', 'name', 'email', 'password', 'birth_date', 'city', 'state', 'gender', 'type_profile', 'cpf', 'phone', 'image', 'is_staff', 'is_active'] | ||
| 34 | + widgets = { | ||
| 35 | + 'password':forms.PasswordInput | ||
| 36 | + } | ||
| 37 | + | ||
| 13 | class UserForm(RegisterUserForm): | 38 | class UserForm(RegisterUserForm): |
| 14 | 39 | ||
| 15 | class Meta: | 40 | class Meta: |