# HG changeset patch # User Goffi # Date 1358105442 -3600 # Node ID 3d998119237ead56dca4359e59a2f607e9797541 # Parent 631556a6485068070965e9a7bac11ffccaba6322 browser side: added login characters check in login panel (similar to the one in register panel) diff -r 631556a64850 -r 3d998119237e browser_side/register.py --- a/browser_side/register.py Sun Jan 13 20:03:55 2013 +0100 +++ b/browser_side/register.py Sun Jan 13 20:30:42 2013 +0100 @@ -28,18 +28,15 @@ from pyjamas.ui.HorizontalPanel import HorizontalPanel from pyjamas.ui.TabPanel import TabPanel from pyjamas.ui.TabBar import TabBar -from pyjamas.ui.Grid import Grid from pyjamas.ui.PasswordTextBox import PasswordTextBox from pyjamas.ui.TextBox import TextBox from pyjamas.ui.FormPanel import FormPanel from pyjamas.ui.Button import Button from pyjamas.ui.Label import Label -from pyjamas.ui.CheckBox import CheckBox from pyjamas.ui.PopupPanel import PopupPanel from pyjamas.ui.Image import Image from pyjamas.ui.Hidden import Hidden from pyjamas import Window -from pyjamas.ui import HasAlignment import re @@ -142,8 +139,12 @@ self.setAction('register_api/login') def onLogin(self, button): - self.submit_type.setValue('login') - self.submit() + if not re.match(r'^[a-z0-9_-]+$',self.login_box.getText(), re.IGNORECASE): + self.login_warning_msg.setText('Invalid login, valid characters are a-z A-Z 0-9 _ -') + self.login_warning_msg.setVisible(True) + else: + self.submit_type.setValue('login') + self.submit() def onRegister(self, button): if not re.match(r'^[a-z0-9_-]+$',self.register_login_box.getText(), re.IGNORECASE):