2025-summer/team-3
12
Fork 0
Code Issues Pull requests Projects Releases Activity

improve access permission form fields

Browse source
This commit is contained in:
Laura Klünder 2017-12-08 21:54:04 +01:00
parent 7ed8822722
commit bf66a812db
2 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/c3nav/control/forms.py
View file

@ -6,7 +6,7 @@ from itertools import chain
from django.core.cache import cache from django.core.cache import cache
from django.db import transaction from django.db import transaction
from django.db.models import Q from django.db.models import Q
from django.forms import BooleanField, ChoiceField, Form, ModelForm from django.forms import ChoiceField, Form, ModelForm
from django.utils import timezone from django.utils import timezone
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from django.utils.translation import ungettext_lazy from django.utils.translation import ungettext_lazy
@ -60,8 +60,7 @@ class AccessPermissionForm(Form):
for pk, access_restriction in self.access_restrictions.items() for pk, access_restriction in self.access_restrictions.items()
))) )))
self.fields['access_restrictions'] = ChoiceField(label=_('Access Permission'), self.fields['access_restrictions'] = ChoiceField(choices=choices, required=True)
choices=choices, required=True)
expire_choices = [ expire_choices = [
('', _('never')), ('', _('never')),
@ -82,11 +81,11 @@ class AccessPermissionForm(Form):
(str(days*24*60), ungettext_lazy('in %d day', 'in %d days', days) % days) (str(days*24*60), ungettext_lazy('in %d day', 'in %d days', days) % days)
) )
self.fields['expires'] = ChoiceField(label=_('expires'), required=False, initial='60', self.fields['expires'] = ChoiceField(required=False, initial='60', choices=expire_choices)
choices=expire_choices)
if request.user_permissions.access_all: if request.user_permissions.access_all:
self.fields['can_grant'] = BooleanField(label=_('can grant'), required=False) choices = [('0', '---')]*6 + [('1', _('can pass on'))] + [('0', '---')]*3
self.fields['can_grant'] = ChoiceField(required=False, initial='60', choices=choices)
def clean_access_restrictions(self): def clean_access_restrictions(self):
data = self.cleaned_data['access_restrictions'] data = self.cleaned_data['access_restrictions']
@ -123,7 +122,7 @@ class AccessPermissionForm(Form):
if author_expires is not None: if author_expires is not None:
expires = author_expires if expires is None else min(expires, author_expires) expires = author_expires if expires is None else min(expires, author_expires)
restrictions.append((restriction.pk, expires)) restrictions.append((restriction.pk, expires))
return (tuple(restrictions), self.author.pk, self.cleaned_data.get('can_grant', False)) return (tuple(restrictions), self.author.pk, self.cleaned_data.get('can_grant', '0') == '1')
@classmethod @classmethod
def _save_code(cls, code, user): def _save_code(cls, code, user):

2
src/c3nav/control/templates/control/user.html
View file

@ -54,7 +54,7 @@
</div> </div>
{% if access_permission_form.can_grant %} {% if access_permission_form.can_grant %}
<div class="field"> <div class="field">
<label>{{ access_permission_form.can_grant }} {{ access_permission_form.can_grant.label }}</label> {{ access_permission_form.can_grant }}
</div> </div>
{% endif %} {% endif %}
<div class="field"> <div class="field">