rezometz/re2o
8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-11-24 20:33:11 +00:00
Code Issues Releases Wiki Activity

["Printer] fix print_as keyerror

Browse source
This commit is contained in:
Gabriel Detraz 2018-10-26 02:53:57 +02:00 committed by root
parent 91becb9bdb
commit 7c3788f019
3 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
printer/forms.py
View file

@ -14,6 +14,7 @@ from django.utils.translation import ugettext_lazy as _
import itertools import itertools
from re2o.field_permissions import FieldPermissionFormMixin
from re2o.mixins import FormRevMixin from re2o.mixins import FormRevMixin
from users.models import User from users.models import User
@ -23,17 +24,15 @@ from .models import (
) )
class JobWithOptionsForm(FormRevMixin, ModelForm): class JobWithOptionsForm(FieldPermissionFormMixin, FormRevMixin, ModelForm):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
prefix = kwargs.pop('prefix', self.Meta.model.__name__) prefix = kwargs.pop('prefix', self.Meta.model.__name__)
self.user = kwargs.pop('user') user=kwargs.get('user')
super(JobWithOptionsForm, self).__init__(*args, prefix=prefix, **kwargs) super(JobWithOptionsForm, self).__init__(*args, prefix=prefix, **kwargs)
if not self.user.adherent.club_members.all(): if 'printAs' in self.fields:
self.fields.pop('printAs')
else:
self.fields['printAs'].label = _('Print As') self.fields['printAs'].label = _('Print As')
self.fields['printAs'].empty_label = self.user.pseudo self.fields['printAs'].empty_label = user.pseudo
self.fields['printAs'].queryset = self.user.adherent.club_members.all() self.fields['printAs'].queryset = user.adherent.club_members.all()
class Meta: class Meta:
model = JobWithOptions model = JobWithOptions

13
printer/models.py
View file

@ -19,7 +19,7 @@ from django.utils.translation import ugettext_lazy as _
from django.template.defaultfilters import filesizeformat from django.template.defaultfilters import filesizeformat
from re2o.mixins import RevMixin, AclMixin from re2o.mixins import RevMixin, AclMixin
from re2o.field_permissions import FieldPermissionModelMixin
import users.models import users.models
from .validators import ( from .validators import (
@ -87,7 +87,7 @@ class PrintOperation(RevMixin, AclMixin, models.Model):
return False, _("This is not your print operation task") return False, _("This is not your print operation task")
class JobWithOptions(RevMixin, AclMixin, models.Model): class JobWithOptions(RevMixin, AclMixin, FieldPermissionModelMixin, models.Model):
""" """
This is the main model of printer application : This is the main model of printer application :
@ -234,6 +234,15 @@ class JobWithOptions(RevMixin, AclMixin, models.Model):
return total_price/100 return total_price/100
def __init__(self, *args, **kwargs):
super(JobWithOptions, self).__init__(*args, **kwargs)
self.field_permissions = {
'printAs': self.can_change_printas,
}
def can_change_printas(self, user_request, *_args, **_kwargs):
return user_request.adherent.club_members.all(), None
def save(self, *args, **kwargs): def save(self, *args, **kwargs):
self._update_price() self._update_price()
super(JobWithOptions, self).save(*args, **kwargs) super(JobWithOptions, self).save(*args, **kwargs)

3
printer/views.py
View file

@ -69,8 +69,7 @@ def new_job(request):
job_instance.filename = filename job_instance.filename = filename
job_instance.print_operation = print_operation job_instance.print_operation = print_operation
job_instance.user=request.user job_instance.user=request.user
job_instance.printAs = job.cleaned_data.get('printAs', request.user)
job_instance.printAs = job.cleaned_data['printAs'] or request.user
metadata = pdfinfo(request.FILES['form-%s-file' % count].temporary_file_path()) metadata = pdfinfo(request.FILES['form-%s-file' % count].temporary_file_path())
job_instance.pages = metadata["Pages"] job_instance.pages = metadata["Pages"]
job_instance.save() job_instance.save()