openstack
/
murano-dashboard
Code Issues Proposed changes

Fixing domain requirements (exclude underline) 

Change-Id: Ib10e040bb51041a28598e168270325e084f4cb32
This commit is contained in:
Ekaterina Fedorova 2013-05-29 19:01:01 +04:00 committed by Serg Melikyan
parent e83eb0c099
commit b77c9f977c
1 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
muranodashboard/panel/forms.py
View File

@ -22,11 +22,6 @@ from muranodashboard.panel import api
log = logging.getLogger(__name__)
name_re = re.compile(r'^[-\w]+$')
validate_name = RegexValidator(name_re, _(u'Enter a valid name consisting '
u'of letters, numbers, \
underscores or hyphens.'), 'invalid')
class PasswordField(forms.CharField):
special_characters = '!@#$%^&*()_+|\/.,~?><:{}'
@ -42,16 +37,16 @@ class PasswordField(forms.CharField):
required=True, validators=
[self.validate_password],
label=label,
error_messages={'invalid':
self.validate_password.message,
'required':
'Password is required'},
error_messages={
'invalid':
self.validate_password.message},
widget=forms.PasswordInput(
render_value=False),
render_value=False),
*args, **kwargs)
class WizardFormServiceType(forms.Form):
ad_service = ('Active Directory', 'Active Directory')
iis_service = ('IIS', 'Internet Information Services')
asp_service = ('ASP.NET Application', 'ASP.NET Application')
@ -80,13 +75,19 @@ class CommonPropertiesExtension(object):
class WizardFormADConfiguration(forms.Form, CommonPropertiesExtension):
domain_name_re = re.compile(r'^[a-zA-Z0-9-]+$')
validate_domain_name = RegexValidator(domain_name_re,
_(u'Enter a valid \
Standard DNS domain name'),
'invalid')
dc_name = forms.CharField(label=_('Domain Name'),
min_length=2,
max_length=64,
required=True,
validators=[validate_name], error_messages=
{'invalid': validate_name.message},
)
validators=[validate_domain_name],
error_messages=
{'invalid': validate_domain_name.message})
dc_count = forms.IntegerField(label=_('Instance Count'),
required=True,
@ -104,7 +105,14 @@ class WizardFormADConfiguration(forms.Form, CommonPropertiesExtension):
class WizardFormIISConfiguration(forms.Form, CommonPropertiesExtension):
name_re = re.compile(r'^[-\w]+$')
validate_name = RegexValidator(name_re,
_(u'Enter a valid name consisting of \
letters, numbers, underscores or \
hyphens.'), 'invalid')
iis_name = forms.CharField(label=_('Service Name'),
min_length=2, max_length=64,
required=True, validators=[validate_name],
error_messages=
{'invalid': validate_name.message})
@ -145,11 +153,10 @@ class WebFarmExtension(forms.Form):
class WizardFormAspNetAppConfiguration(WizardFormIISConfiguration,
WebFarmExtension,
CommonPropertiesExtension):
git_repo_re = re.compile(r'(\w+://)(.+@)*([\w\d\.]+)(:[\d]+)?/*(.*)',
re.IGNORECASE)
validate_git = RegexValidator(git_repo_re,
_('Input correct git repository url'),
_('Enter correct git repository url'),
'invalid')
repository = forms.CharField(label=_('Git repository'),