diff --git a/accounting/views.py b/accounting/views.py index c70de381..76452292 100644 --- a/accounting/views.py +++ b/accounting/views.py @@ -304,14 +304,15 @@ class OperationForm(forms.ModelForm): def clean(self): self.cleaned_data = super(OperationForm, self).clean() - if self.cleaned_data['target_type'] == "USER": - self.cleaned_data['target_id'] = self.cleaned_data['user'].id - elif self.cleaned_data['target_type'] == "ACCOUNT": - self.cleaned_data['target_id'] = self.cleaned_data['club_account'].id - elif self.cleaned_data['target_type'] == "CLUB": - self.cleaned_data['target_id'] = self.cleaned_data['club'].id - elif self.cleaned_data['target_type'] == "COMPANY": - self.cleaned_data['target_id'] = self.cleaned_data['company'].id + if 'target_type' in self.cleaned_data.keys(): + if self.cleaned_data['target_type'] == "USER": + self.cleaned_data['target_id'] = self.cleaned_data['user'].id + elif self.cleaned_data['target_type'] == "ACCOUNT": + self.cleaned_data['target_id'] = self.cleaned_data['club_account'].id + elif self.cleaned_data['target_type'] == "CLUB": + self.cleaned_data['target_id'] = self.cleaned_data['club'].id + elif self.cleaned_data['target_type'] == "COMPANY": + self.cleaned_data['target_id'] = self.cleaned_data['company'].id return self.cleaned_data def save(self): diff --git a/com/views.py b/com/views.py index b4b473d4..4597a71d 100644 --- a/com/views.py +++ b/com/views.py @@ -348,7 +348,7 @@ class WeekmailArticleEditView(ComTabsMixin, QuickNotifMixin, CanEditPropMixin, U quick_notif_url_arg = "qn_weekmail_article_edit" current_tab = "weekmail" -class WeekmailArticleCreateView(QuickNotifMixin, CreateView): #XXX need to protect this view +class WeekmailArticleCreateView(QuickNotifMixin, CanViewMixin, CreateView): #XXX need to protect this view """Post an article""" model = WeekmailArticle fields = ['title', 'club', 'content'] diff --git a/counter/views.py b/counter/views.py index 8981bfda..7e2d1daf 100644 --- a/counter/views.py +++ b/counter/views.py @@ -74,11 +74,10 @@ class CounterAdminMixin(View): def dispatch(self, request, *args, **kwargs): - res = super(CounterAdminMixin, self).dispatch(request, *args, **kwargs) if not (request.user.is_root or self._test_group(request.user) or self._test_club(request.user)): raise PermissionDenied - return res + return super(CounterAdminMixin, self).dispatch(request, *args, **kwargs) class GetUserForm(forms.Form): """