исправлена 500 для комментов, добавлено поле для выдачи пользователю РО

remotes/origin/stage6
Alexander Burdeinyi 9 years ago
parent 77e0beaadd
commit f042ab23db
  1. 1
      accounts/models.py
  2. 7
      comments/forms.py
  3. 5
      comments/views.py
  4. 3
      functions/forms.py
  5. 1
      templates/c_admin/includes/admin_nav.html

@ -123,6 +123,7 @@ class User(AbstractBaseUser, PermissionsMixin, GetURLorPK):
related_name='users')
position = models.CharField(verbose_name=_(u'Должность'), max_length=255, blank=True)
blocked = models.BooleanField(verbose_name=_(u'Заблокирован?'), default=False)
readonly = models.BooleanField(_(u'Read Only'), default=False)
objects = UserManager()

@ -1,6 +1,7 @@
# -*- coding: utf-8 -*-
from django import forms
from functions.forms import EmptySelect
from .models import Comment
@ -8,7 +9,13 @@ class CommentForm(forms.ModelForm):
class Meta:
model = Comment
fields = ['parent', 'text']
widgets = dict(parent=EmptySelect)
def save(self, commit=True):
obj = super(CommentForm, self).save(commit=False)
return obj
def clean(self):
if getattr(self._user, 'readonly', True):
raise forms.ValidationError(_(u'Вы не можете оставлять комментарии. Вам выдано ограничение ReadOnly.'))
return super(CommentForm, self).clean()

@ -11,13 +11,16 @@ class CommentMixin(FormMixin):
def get_comment_form(self):
form_class = self.get_form_class()
return self.get_form(form_class)
form = self.get_form(form_class)
form._user = self.request.user
return form
def post(self, request, *args, **kwargs):
self.commentform = None
if request.method == 'POST' and request.is_ajax():
self.commentform = self.get_comment_form()
if self.commentform.is_valid():
self.object = self.get_object()
self.save_comment()
return JsonResponse({'success': True})
else:

@ -226,4 +226,7 @@ class ML_ModelMultipleChoiceField(forms.ModelMultipleChoiceField):
# choices = property(_get_choices, forms.ChoiceField._set_choices)
class EmptySelect(forms.Select):
def render_option(self, selected_choices, option_value, option_label):
return ''

@ -32,6 +32,7 @@
<li><a href="/admin/accounts/all">Пользователи</a></li>
<li><a href="/admin/company/all">Компании</a></li>
<li><a href="{% url 'admin_accounts_statistic' %}">Статистика</a></li>
<li><a href="{% url 'admin:comments_comment_changelist' %}">{% trans "Комментарии" %}</a></li>
</ul>
</li>

Loading…
Cancel
Save