burmatovan/openuds
1
0
Fork 0
forked from shaba/openuds
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed a little bug on form creation

Browse Source
This commit is contained in:
Adolfo Gómez 2014-03-07 06:35:45 +00:00
parent 55ce029b68
commit 41fba86f93
1 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
server/src/uds/web/forms/LoginForm.py
View File

@ -5,27 +5,27 @@ from django.utils.safestring import mark_safe
# Copyright (c) 2012 Virtual Cable S.L. # Copyright (c) 2012 Virtual Cable S.L.
# All rights reserved. # All rights reserved.
# #
# Redistribution and use in source and binary forms, with or without modification, # Redistribution and use in source and binary forms, with or without modification,
# are permitted provided that the following conditions are met: # are permitted provided that the following conditions are met:
# #
# * Redistributions of source code must retain the above copyright notice, # * Redistributions of source code must retain the above copyright notice,
# this list of conditions and the following disclaimer. # this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above copyright notice, # * Redistributions in binary form must reproduce the above copyright notice,
# this list of conditions and the following disclaimer in the documentation # this list of conditions and the following disclaimer in the documentation
# and/or other materials provided with the distribution. # and/or other materials provided with the distribution.
# * Neither the name of Virtual Cable S.L. nor the names of its contributors # * Neither the name of Virtual Cable S.L. nor the names of its contributors
# may be used to endorse or promote products derived from this software # may be used to endorse or promote products derived from this software
# without specific prior written permission. # without specific prior written permission.
# #
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE # DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER # SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, # CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
''' '''
@ -44,20 +44,20 @@ logger = logging.getLogger(__name__)
class CustomSelect(forms.Select): class CustomSelect(forms.Select):
def render(self, name, value, attrs=None): def render(self, name, value, attrs=None):
if len(self.choices) < 2: if len(self.choices) < 2:
visible = 'style="display: none;"' visible = ' style="display: none;"'
else: else:
visible = ''; visible = '';
res = '<select id="id_{0}" name="{0}" class="selectpicker show-menu-arrow" data-header="{1}" data-size="8" data-width="100%" >'.format(name, ugettext('Select authenticator')) res = '<select id="id_{0}" name="{0}" class="selectpicker show-menu-arrow" data-header="{1}" data-size="8" data-width="100%" >'.format(name, ugettext('Select authenticator'))
for choice in self.choices: for choice in self.choices:
res += '<option value="{0}">{1}</option>'.format(choice[0], choice[1]) res += '<option value="{0}">{1}</option>'.format(choice[0], choice[1])
res += '</select>' res += '</select>'
return mark_safe('<div class="form-group"{0}><label>'.format(visible) + unicode(_('authenticator')) + '</label>' + res + '</div>') return mark_safe('<div class="form-group"{0}><label>'.format(visible) + unicode(_('authenticator')) + '</label>' + res + '</div>')
class BaseForm(forms.Form): class BaseForm(forms.Form):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super(BaseForm, self).__init__(*args, **kwargs) super(BaseForm, self).__init__(*args, **kwargs)
def add_form_error(self, message): def add_form_error(self, message):
if not self._errors: if not self._errors:
self._errors = ErrorDict() self._errors = ErrorDict()
@ -68,24 +68,24 @@ class BaseForm(forms.Form):
class LoginForm(BaseForm): class LoginForm(BaseForm):
user = forms.CharField(label=_('Username'), max_length=64, widget=forms.TextInput()) user = forms.CharField(label=_('Username'), max_length=64, widget=forms.TextInput())
password = forms.CharField(label=_('Password'), widget=forms.PasswordInput(attrs={'title': _('Password')}), required=False) password = forms.CharField(label=_('Password'), widget=forms.PasswordInput(attrs={'title': _('Password')}), required=False)
authenticator = forms.ChoiceField(label=_('Authenticator'), choices = (), widget=CustomSelect(), required=False) authenticator = forms.ChoiceField(label=_('Authenticator'), choices=(), widget=CustomSelect(), required=False)
java = forms.CharField(widget = forms.HiddenInput()) java = forms.CharField(widget=forms.HiddenInput())
standard = forms.CharField(widget = forms.HiddenInput(), required=False) standard = forms.CharField(widget=forms.HiddenInput(), required=False)
nonStandard = forms.CharField(widget = forms.HiddenInput(), required=False) nonStandard = forms.CharField(widget=forms.HiddenInput(), required=False)
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
# If an specified login is passed in, retrieve it & remove it from kwargs dict # If an specified login is passed in, retrieve it & remove it from kwargs dict
smallName = kwargs.get('smallName', None) smallName = kwargs.get('smallName', None)
if kwargs.has_key('smallName'): if kwargs.has_key('smallName'):
del kwargs['smallName'] del kwargs['smallName']
logger.debug('smallName is "{0}"'.format(smallName)) logger.debug('smallName is "{0}"'.format(smallName))
super(LoginForm, self).__init__(*args, **kwargs) super(LoginForm, self).__init__(*args, **kwargs)
choices = [] choices = []
nonStandard = [] nonStandard = []
standard = [] standard = []
auths = None auths = None
if smallName is not None: if smallName is not None:
auths = Authenticator.objects.filter(small_name=smallName).order_by('priority', 'name') auths = Authenticator.objects.filter(small_name=smallName).order_by('priority', 'name')
@ -95,16 +95,16 @@ class LoginForm(BaseForm):
logger.debug(list(auths)) logger.debug(list(auths))
else: else:
auths = Authenticator.objects.all().order_by('priority', 'name') auths = Authenticator.objects.all().order_by('priority', 'name')
for a in auths: for a in auths:
if a.getType() is None: if a.getType() is None:
continue continue
choices.append( (a.id, a.name) ) choices.append((a.id, a.name))
if a.getType().isCustom(): if a.getType().isCustom():
nonStandard.append(str(a.id)) nonStandard.append(str(a.id))
else: else:
standard.append(str(a.id)) standard.append(str(a.id))
self.fields['authenticator'].choices = choices self.fields['authenticator'].choices = choices
self.fields['nonStandard'].initial = ','.join(nonStandard) self.fields['nonStandard'].initial = ','.join(nonStandard)
self.fields['standard'].initial = ','.join(standard) self.fields['standard'].initial = ','.join(standard)