8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-11-29 16:12:26 +00:00

Merge branch '151-disable-shortcuts' into 'dev'

Fix #151

See merge request federez/re2o!441
This commit is contained in:
chirac 2019-09-20 15:00:19 +02:00
commit 7bc300c3a6
5 changed files with 34 additions and 4 deletions

View file

@ -301,8 +301,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
let s = Sapphire(); let s = Sapphire();
Konami(s.activate); Konami(s.activate);
</script> </script>
{% if request.user.shortcuts_enabled %}
<script src="/static/js/shortcuts.js"></script> <script src="/static/js/shortcuts.js"></script>
{% endif %}
{# Read the documentation for more information #} {# Read the documentation for more information #}
</body> </body>
</html> </html>

View file

@ -441,7 +441,8 @@ class AdherentEditForm(AdherentForm):
'telephone', 'telephone',
'room', 'room',
'shell', 'shell',
'gpg_fingerprint' 'gpg_fingerprint',
'shortcuts_enabled',
] ]
class ClubForm(FormRevMixin, FieldPermissionFormMixin, ModelForm): class ClubForm(FormRevMixin, FieldPermissionFormMixin, ModelForm):

View file

@ -0,0 +1,20 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11.23 on 2019-09-20 12:38
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('users', '0082_auto_20190908_1338'),
]
operations = [
migrations.AddField(
model_name='user',
name='shortcuts_enabled',
field=models.BooleanField(default=True, verbose_name='Enable shortcuts on Re2o website'),
),
]

View file

@ -247,6 +247,10 @@ class User(RevMixin, FieldPermissionModelMixin, AbstractBaseUser,
blank=True, blank=True,
null=True null=True
) )
shortcuts_enabled = models.BooleanField(
verbose_name=_("Enable shortcuts on Re2o website"),
default=True
)
USERNAME_FIELD = 'pseudo' USERNAME_FIELD = 'pseudo'
REQUIRED_FIELDS = ['surname', 'email'] REQUIRED_FIELDS = ['surname', 'email']

View file

@ -305,6 +305,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<dd>{{ users.shell }}</dd> <dd>{{ users.shell }}</dd>
</div> </div>
{% endif %} {% endif %}
<div class="col-md-6 col-xs-12">
<dt>{% trans "Shortcuts enabled" %}</dt>
<dd>{{ users.shortcuts_enabled | tick }}</dd>
</div>
</dl> </dl>
</div> </div>
</div> </div>