klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith.git synced 2024-11-25 18:44:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix' into 'master'

Browse Source 
Fix crash when no target_type specified on accounting

Il y a aussi d'autres commit que j'ai oublié de faire merge

See merge request !71
This commit is contained in:
Skia 2017-05-07 19:43:55 +02:00
commit 5920e0e52a
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
accounting/views.py
View File

@ -304,14 +304,15 @@ class OperationForm(forms.ModelForm):
def clean(self): def clean(self):
self.cleaned_data = super(OperationForm, self).clean() self.cleaned_data = super(OperationForm, self).clean()
if self.cleaned_data['target_type'] == "USER": if 'target_type' in self.cleaned_data.keys():
self.cleaned_data['target_id'] = self.cleaned_data['user'].id if self.cleaned_data['target_type'] == "USER":
elif self.cleaned_data['target_type'] == "ACCOUNT": self.cleaned_data['target_id'] = self.cleaned_data['user'].id
self.cleaned_data['target_id'] = self.cleaned_data['club_account'].id elif self.cleaned_data['target_type'] == "ACCOUNT":
elif self.cleaned_data['target_type'] == "CLUB": self.cleaned_data['target_id'] = self.cleaned_data['club_account'].id
self.cleaned_data['target_id'] = self.cleaned_data['club'].id elif self.cleaned_data['target_type'] == "CLUB":
elif self.cleaned_data['target_type'] == "COMPANY": self.cleaned_data['target_id'] = self.cleaned_data['club'].id
self.cleaned_data['target_id'] = self.cleaned_data['company'].id elif self.cleaned_data['target_type'] == "COMPANY":
self.cleaned_data['target_id'] = self.cleaned_data['company'].id
return self.cleaned_data return self.cleaned_data
def save(self): def save(self):

2
com/views.py
View File

@ -348,7 +348,7 @@ class WeekmailArticleEditView(ComTabsMixin, QuickNotifMixin, CanEditPropMixin, U
quick_notif_url_arg = "qn_weekmail_article_edit" quick_notif_url_arg = "qn_weekmail_article_edit"
current_tab = "weekmail" 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""" """Post an article"""
model = WeekmailArticle model = WeekmailArticle
fields = ['title', 'club', 'content'] fields = ['title', 'club', 'content']

3
counter/views.py
View File

@ -74,11 +74,10 @@ class CounterAdminMixin(View):
def dispatch(self, request, *args, **kwargs): 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) if not (request.user.is_root or self._test_group(request.user)
or self._test_club(request.user)): or self._test_club(request.user)):
raise PermissionDenied raise PermissionDenied
return res return super(CounterAdminMixin, self).dispatch(request, *args, **kwargs)
class GetUserForm(forms.Form): class GetUserForm(forms.Form):
""" """