Skip to content
Snippets Groups Projects
Commit 97020b42 authored by Samuel GAIST's avatar Samuel GAIST Committed by Flavio TARSETTI
Browse files

[ui][all] Pre-commit cleanup

parent 7acf9639
No related branches found
No related tags found
2 merge requests!368Cleanup ui,!342Django 3 migration
Pipeline #42700 passed
Stage: build
Hide whitespace changes
Inline Side-by-side
beat/web/ui/forms.py
+ 73
− 57
View file @ 97020b42
......@@ -32,10 +32,12 @@
from django import forms
from django.core.files.base import ContentFile
from .widgets import CodeMirrorFileWidget, CodeMirrorTextarea
from ..common.models import Contribution
from ..common.utils import validate_restructuredtext
from .widgets import CodeMirrorFileWidget
from .widgets import CodeMirrorTextarea
class NameField(forms.CharField):
"""A specialization of the CharField that runs algo name validation"""
......@@ -46,11 +48,11 @@ class NameField(forms.CharField):
def to_python(self, value):
"""Converts the name to a valid python value"""
if not value:
raise forms.ValidationError(u'A non-blank name is required.')
raise forms.ValidationError(u"A non-blank name is required.")
return Contribution.sanitize_name(value)
#-----------------------------------------------------------------------------
# -----------------------------------------------------------------------------
class CodeMirrorCharField(forms.CharField):
......@@ -61,57 +63,62 @@ class CodeMirrorCharField(forms.CharField):
codemirror_kwargs = dict(codemirror_kwargs)
# handles the readonly attribute gracefully
if 'readonly' in kwargs:
if kwargs['readonly']:
config = codemirror_kwargs.get('config', {})
config['readOnly'] = True
codemirror_kwargs['config'] = config
del kwargs['readonly']
kwargs.update({'widget': CodeMirrorTextarea(**codemirror_kwargs)})
if "readonly" in kwargs:
if kwargs["readonly"]:
config = codemirror_kwargs.get("config", {})
config["readOnly"] = True
codemirror_kwargs["config"] = config
del kwargs["readonly"]
kwargs.update({"widget": CodeMirrorTextarea(**codemirror_kwargs)})
super(CodeMirrorCharField, self).__init__(*args, **kwargs)
def to_python(self, data):
clean_data = data.replace('\r', '') if data else ''
clean_data = data.replace("\r", "") if data else ""
return super(CodeMirrorCharField, self).to_python(clean_data)
class CodeMirrorRSTCharField(CodeMirrorCharField):
"""Allows editing a text field with a source code editor"""
def __init__(self, codemirror_kwargs={}, *args, **kwargs):
codemirror_kwargs = dict(codemirror_kwargs)
addon_js = list(codemirror_kwargs.get('addon_js', []))
addon_js = list(codemirror_kwargs.get("addon_js", []))
addon_js += [
"display/rulers",
]
codemirror_kwargs['addon_js'] = addon_js
codemirror_kwargs["addon_js"] = addon_js
codemirror_kwargs['mode'] = 'rst'
config = codemirror_kwargs.get('config', {})
config['foldGutter'] = False
config['gutters'] = ["CodeMirror-linenumbers"]
codemirror_kwargs['config'] = config
codemirror_kwargs["mode"] = "rst"
config = codemirror_kwargs.get("config", {})
config["foldGutter"] = False
config["gutters"] = ["CodeMirror-linenumbers"]
codemirror_kwargs["config"] = config
super(CodeMirrorRSTCharField, self).__init__(codemirror_kwargs, *args, **kwargs)
def to_python(self, data):
validate_restructuredtext(data)
return super(CodeMirrorRSTCharField, self).to_python(data)
class CodeMirrorPythonCharField(CodeMirrorCharField):
"""Allows editing a file instead of a plain content"""
def __init__(self, codemirror_kwargs={}, *args, **kwargs):
codemirror_kwargs = dict(codemirror_kwargs)
addon_js = list(codemirror_kwargs.get('addon_js', []))
addon_js = list(codemirror_kwargs.get("addon_js", []))
addon_js += [
"fold/indent-fold",
"display/rulers",
"display/rulers",
]
codemirror_kwargs['addon_js'] = addon_js
codemirror_kwargs["addon_js"] = addon_js
codemirror_kwargs["mode"] = "python"
super(CodeMirrorPythonCharField, self).__init__(
codemirror_kwargs, *args, **kwargs
)
codemirror_kwargs['mode'] = 'python'
super(CodeMirrorPythonCharField, self).__init__(codemirror_kwargs, *args, **kwargs)
class CodeMirrorJSONCharField(CodeMirrorCharField):
"""Allows editing a file instead of a plain content"""
......@@ -119,19 +126,21 @@ class CodeMirrorJSONCharField(CodeMirrorCharField):
def __init__(self, codemirror_kwargs={}, *args, **kwargs):
codemirror_kwargs = dict(codemirror_kwargs)
addon_js = list(codemirror_kwargs.get('addon_js', []))
addon_js = list(codemirror_kwargs.get("addon_js", []))
addon_js += [
"fold/brace-fold",
"display/rulers",
"display/rulers",
]
codemirror_kwargs['addon_js'] = addon_js
codemirror_kwargs["addon_js"] = addon_js
codemirror_kwargs['mode'] = {'name': 'javascript', 'json': True}
codemirror_kwargs["mode"] = {"name": "javascript", "json": True}
super(CodeMirrorJSONCharField, self).__init__(codemirror_kwargs, *args, **kwargs)
super(CodeMirrorJSONCharField, self).__init__(
codemirror_kwargs, *args, **kwargs
)
#-----------------------------------------------------------------------------
# -----------------------------------------------------------------------------
class CodeMirrorFileField(forms.FileField):
......@@ -141,59 +150,64 @@ class CodeMirrorFileField(forms.FileField):
codemirror_kwargs = dict(codemirror_kwargs)
# handles the readonly attribute gracefully
if 'readonly' in kwargs:
if kwargs['readonly']:
config = codemirror_kwargs.get('config', {})
config['readOnly'] = True
codemirror_kwargs['config'] = config
del kwargs['readonly']
kwargs.update({'widget': CodeMirrorFileWidget(**codemirror_kwargs)})
if "readonly" in kwargs:
if kwargs["readonly"]:
config = codemirror_kwargs.get("config", {})
config["readOnly"] = True
codemirror_kwargs["config"] = config
del kwargs["readonly"]
kwargs.update({"widget": CodeMirrorFileWidget(**codemirror_kwargs)})
super(CodeMirrorFileField, self).__init__(*args, **kwargs)
def to_python(self, data):
data = ContentFile(data.replace('\r',''))
data.name = '__ignore__'
data = ContentFile(data.replace("\r", ""))
data.name = "__ignore__"
return super(CodeMirrorFileField, self).to_python(data)
class CodeMirrorRSTFileField(CodeMirrorFileField):
"""Allows editing a text field with a source code editor"""
def __init__(self, codemirror_kwargs={}, *args, **kwargs):
codemirror_kwargs = dict(codemirror_kwargs)
addon_js = list(codemirror_kwargs.get('addon_js', []))
addon_js = list(codemirror_kwargs.get("addon_js", []))
addon_js += [
"display/rulers",
]
codemirror_kwargs['addon_js'] = addon_js
codemirror_kwargs["addon_js"] = addon_js
codemirror_kwargs['mode'] = 'rst'
config = codemirror_kwargs.get('config', {})
config['foldGutter'] = False
config['gutters'] = ["CodeMirror-linenumbers"]
codemirror_kwargs['config'] = config
codemirror_kwargs["mode"] = "rst"
config = codemirror_kwargs.get("config", {})
config["foldGutter"] = False
config["gutters"] = ["CodeMirror-linenumbers"]
codemirror_kwargs["config"] = config
super(CodeMirrorRSTFileField, self).__init__(codemirror_kwargs, *args, **kwargs)
def to_python(self, data):
validate_restructuredtext(data)
return super(CodeMirrorRSTFileField, self).to_python(data)
class CodeMirrorPythonFileField(CodeMirrorFileField):
"""Allows editing a file instead of a plain content"""
def __init__(self, codemirror_kwargs={}, *args, **kwargs):
codemirror_kwargs = dict(codemirror_kwargs)
addon_js = list(codemirror_kwargs.get('addon_js', []))
addon_js = list(codemirror_kwargs.get("addon_js", []))
addon_js += [
"fold/indent-fold",
"display/rulers",
"display/rulers",
]
codemirror_kwargs['addon_js'] = addon_js
codemirror_kwargs["addon_js"] = addon_js
codemirror_kwargs["mode"] = "python"
super(CodeMirrorPythonFileField, self).__init__(
codemirror_kwargs, *args, **kwargs
)
codemirror_kwargs['mode'] = 'python'
super(CodeMirrorPythonFileField, self).__init__(codemirror_kwargs, *args, **kwargs)
class CodeMirrorJSONFileField(CodeMirrorFileField):
"""Allows editing a file instead of a plain content"""
......@@ -201,13 +215,15 @@ class CodeMirrorJSONFileField(CodeMirrorFileField):
def __init__(self, codemirror_kwargs={}, *args, **kwargs):
codemirror_kwargs = dict(codemirror_kwargs)
addon_js = list(codemirror_kwargs.get('addon_js', []))
addon_js = list(codemirror_kwargs.get("addon_js", []))
addon_js += [
"fold/brace-fold",
"display/rulers",
"display/rulers",
]
codemirror_kwargs['addon_js'] = addon_js
codemirror_kwargs["addon_js"] = addon_js
codemirror_kwargs['mode'] = {'name': 'javascript', 'json': True}
codemirror_kwargs["mode"] = {"name": "javascript", "json": True}
super(CodeMirrorJSONFileField, self).__init__(codemirror_kwargs, *args, **kwargs)
super(CodeMirrorJSONFileField, self).__init__(
codemirror_kwargs, *args, **kwargs
)
beat/web/ui/urls.py
+ 3
− 4
View file @ 97020b42
......@@ -25,16 +25,15 @@
# #
###############################################################################
from django.conf.urls import url
from django.conf import settings
from django.views.generic.base import TemplateView
from django.conf.urls import url
from django.contrib.auth import views as auth_views
from django.views.generic.base import TemplateView
from . import views
from .registration.forms import PreregistrationForm
from .registration.views import activate
from .registration.views import register
from .registration.forms import PreregistrationForm
app_name = "ui"
......
beat/web/ui/views.py
+ 23
− 21
View file @ 97020b42
......@@ -26,34 +26,32 @@
###############################################################################
from django.shortcuts import get_object_or_404
from django.shortcuts import render
import datetime
from django.conf import settings
from django.contrib import messages
from django.contrib.auth import views as auth_views
from django.contrib.auth.decorators import login_required
from django.contrib.auth.forms import PasswordChangeForm
from django.contrib.auth.models import User
from django.contrib import messages
from django.core.mail import EmailMessage
from django.db.models import Q
from django.http import Http404
from django.http import HttpResponse
from django.contrib.auth.decorators import login_required
from django.urls import reverse
from django.db.models import Q
from django.core.mail import EmailMessage
from django.shortcuts import get_object_or_404
from django.shortcuts import render
from django.template.loader import render_to_string
from django.conf import settings
from django.urls import reverse
from rest_framework.authtoken.models import Token
from .. import __version__
from ..common.models import Shareable
from ..accounts.models import Profile
from ..accounts.models import SupervisionTrack
from ..accounts.models import TemporaryUrl
from ..common.models import Shareable
from ..utils import mail
from .registration.forms import BlockedUserRevalidationForm
import datetime
try:
from urlparse import urlparse
except ImportError:
......@@ -75,6 +73,7 @@ def index(request):
# ----------------------------------------------------------
class LoginView(auth_views.LoginView):
def post(self, request, *args, **kwargs):
authentication_match = False
......@@ -88,7 +87,9 @@ class LoginView(auth_views.LoginView):
authentication_match = user.check_password(request.POST["password"])
if authentication_match and user.profile.status == Profile.BLOCKED:
reactivation_url = request.build_absolute_uri(reverse('blocked_user_reactivation'))
reactivation_url = request.build_absolute_uri(
reverse("blocked_user_reactivation")
)
context = {
"user": user,
"reactivation_url": reactivation_url,
......@@ -225,16 +226,16 @@ def blocked_user_reactivation(request):
def gather_contributions(requestor, author):
"""Gather contributions that are accessible to a certain requestor"""
from ..experiments.models import Experiment
from ..toolchains.models import Toolchain
from ..algorithms.models import Algorithm
from ..libraries.models import Library
from ..dataformats.models import DataFormat
from ..team.models import Team
from ..attestations.models import Attestation
from ..reports.models import Report
from ..dataformats.models import DataFormat
from ..experiments.models import Experiment
from ..libraries.models import Library
from ..plotters.models import Plotter
from ..reports.models import Report
from ..search.models import Search
from ..team.models import Team
from ..toolchains.models import Toolchain
experiments = Experiment.objects.for_user(requestor).filter(author=author)
toolchains = Toolchain.objects.for_user(requestor).filter(author=author)
......@@ -277,7 +278,8 @@ def activity_stream(request, author_name):
author = get_object_or_404(User, username=author_name)
# gather leaderboards for the following conditions:
from ..search.models import Search, Leaderboard
from ..search.models import Leaderboard
from ..search.models import Search
if request.user == author:
# 1. request.user == author AND user is subscribed
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment