Download as
Browse Code »

Commit 06909be059f94ed5a06f4ebab3ac9fa0be4fcf55

Authored by ailsoncgt
2 parents b9db95e5 d10b1bae
Exists in master and in 5 other branches amadeus_univasf, dev, image-crop, pdf_file_html, refactoring

Fixing conflit

Showing 5 changed files with 38 additions and 8 deletions   Show diff stats
courses/templates/subject/form_view_student.html
  Diff comments   View file @06909be
1   -{% load i18n %}
  1 +{% load static i18n list_topic_foruns %}
2 2  
3 3 {% block javascript %}
4 4 <script type="text/javascript" src="{% static 'js/forum.js' %}"></script>
... ...
forum/static/js/forum.js
  Diff comments   View file @06909be
... ... @@ -57,7 +57,9 @@ function createForum(url, topic) {
57 57 $(".forum_form").html(data);
58 58 $("#id_topic").val(topic);
59 59  
60   - $('.date-picker').datepicker();
  60 + $('.date-picker').datepicker({
  61 + format: 'dd/mm/yyyy',
  62 + });
61 63  
62 64 var frm = $('#forum_create');
63 65 frm.submit(function () {
... ... @@ -92,15 +94,16 @@ function createForum(url, topic) {
92 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 98 $.ajax({
97 99 url: url,
98 100 data: {'pk': forum},
99 101 success: function(data) {
100 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 108 var frm = $('#forum_create');
106 109 frm.submit(function () {
... ... @@ -111,6 +114,8 @@ function editForum(url, forum) {
111 114 success: function (data) {
112 115 $('.forum_view').html(data);
113 116  
  117 + alertify.success(success_message);
  118 +
114 119 $("#editForum").modal('hide');
115 120 },
116 121 error: function(data) {
... ...
forum/templates/forum/forum_view.html
  Diff comments   View file @06909be
... ... @@ -41,7 +41,7 @@
41 41 </div>
42 42 <div class="panel-body">
43 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 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 46 </ul>
47 47 </div>
... ...
users/admin.py
  Diff comments   View file @06909be
1 1 from django.contrib import admin
2 2 from .models import User
3   -from .forms import UserForm
  3 +from .forms import AdminUserForm
4 4  
5 5 class UserAdmin(admin.ModelAdmin):
6 6 list_display = ['username', 'name', 'email', 'is_staff', 'is_active']
7 7 search_fields = ['username', 'name', 'email']
8   - # form = UserForm
  8 + form = AdminUserForm
9 9  
10 10 admin.site.register(User, UserAdmin)
11 11 \ No newline at end of file
... ...
users/forms.py
  Diff comments   View file @06909be
... ... @@ -10,6 +10,31 @@ from django.contrib.auth.forms import UserCreationForm
10 10 from core.forms import RegisterUserForm
11 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 38 class UserForm(RegisterUserForm):
14 39  
15 40 class Meta:
... ...