From 5e46c0f8523c0528cbad860abc682acbde5ce59a Mon Sep 17 00:00:00 2001 From: Pedro Ferreira Date: Wed, 18 Feb 2015 14:25:55 +0100 Subject: [PATCH] VC/Vidyo: Move validate_name to base class --- vc_vidyo/indico_vc_vidyo/forms.py | 5 ----- vc_vidyo/indico_vc_vidyo/plugin.py | 2 -- 2 files changed, 7 deletions(-) diff --git a/vc_vidyo/indico_vc_vidyo/forms.py b/vc_vidyo/indico_vc_vidyo/forms.py index dcb53a8..28f0cce 100644 --- a/vc_vidyo/indico_vc_vidyo/forms.py +++ b/vc_vidyo/indico_vc_vidyo/forms.py @@ -22,7 +22,6 @@ from wtforms.fields.core import BooleanField, SelectField from wtforms.fields.simple import TextAreaField from wtforms.validators import DataRequired, Length, Regexp, Optional, ValidationError -from indico.modules.vc.models import VCRoom from indico.modules.vc.plugins import VCRoomFormBase from indico.util.i18n import _ from indico.util.user import retrieve_principal @@ -103,10 +102,6 @@ class VCRoomForm(VCRoomFormBase): [(session.id, session.title) for session in self.event.getSessionList()]) self.linking._form = self - def validate_name(self, field): - if field.data and VCRoom.find_first(name=field.data): - raise ValidationError(_("There is already a room with this name")) - def validate_moderator(self, field): from indico_vc_vidyo.plugin import VidyoPlugin avatar = retrieve_principal(field.data) diff --git a/vc_vidyo/indico_vc_vidyo/plugin.py b/vc_vidyo/indico_vc_vidyo/plugin.py index d4fe586..c8f53b1 100644 --- a/vc_vidyo/indico_vc_vidyo/plugin.py +++ b/vc_vidyo/indico_vc_vidyo/plugin.py @@ -17,7 +17,6 @@ from __future__ import unicode_literals import re -from flask import render_template from wtforms.fields import IntegerField, TextAreaField from wtforms.fields.html5 import URLField, EmailField @@ -29,7 +28,6 @@ from indico.modules.vc import VCPluginSettingsFormBase, VCPluginMixin from indico.modules.vc.views import WPVCManageEvent from indico.core.plugins import IndicoPlugin, url_for_plugin, IndicoPluginBlueprint from indico.util.i18n import _ -from indico.web.flask.templating import get_overridable_template_name from indico.web.forms.fields import EmailListField, IndicoPasswordField from indico.web.forms.widgets import CKEditorWidget from indico_vc_vidyo.forms import VCRoomForm