From 348b506755cef73d193c0116f35506edbc4a3a80 Mon Sep 17 00:00:00 2001 From: Antonio de la Rosa Date: Mon, 14 Mar 2016 14:32:11 +0100 Subject: [PATCH] Little silly fixes in text --- paramecio/citoplasma/httputils.py | 6 +++++- .../cromosoma/extrafields/passwordfield.py | 6 +++--- paramecio/cromosoma/formsutils.py | 19 ++++++++++++++++++- paramecio/cromosoma/webmodel.py | 11 +++++++++++ paramecio/modules/admin/index.py | 8 ++++---- 5 files changed, 41 insertions(+), 9 deletions(-) diff --git a/paramecio/citoplasma/httputils.py b/paramecio/citoplasma/httputils.py index 2919a47..d61c469 100644 --- a/paramecio/citoplasma/httputils.py +++ b/paramecio/citoplasma/httputils.py @@ -19,11 +19,15 @@ class GetPostFiles: GetPostFiles.get=request.query.decode() @staticmethod - def obtain_post(): + def obtain_post(required_post=[]): GetPostFiles.post={} GetPostFiles.post=request.forms.decode() + + for post in required_post: + + GetPostFiles.post[post]=GetPostFiles.post.get(post, '') @staticmethod def obtain_files(): diff --git a/paramecio/cromosoma/extrafields/passwordfield.py b/paramecio/cromosoma/extrafields/passwordfield.py index 8f92311..0a2b01c 100644 --- a/paramecio/cromosoma/extrafields/passwordfield.py +++ b/paramecio/cromosoma/extrafields/passwordfield.py @@ -28,11 +28,11 @@ class PasswordField(PhangoField): return "" else: - self.txt_error="The value is empty" + self.txt_error="The field is empty" self.error=True else: - self.txt_error="The value is empty" + self.txt_error="The field is empty" self.error=True else: @@ -46,4 +46,4 @@ class PasswordField(PhangoField): return bcrypt.verify(password, h) - \ No newline at end of file + diff --git a/paramecio/cromosoma/formsutils.py b/paramecio/cromosoma/formsutils.py index daa9db8..7bd822c 100644 --- a/paramecio/cromosoma/formsutils.py +++ b/paramecio/cromosoma/formsutils.py @@ -1,6 +1,8 @@ #!/usr/bin/python3 from paramecio.cromosoma import corefields +from paramecio.cromosoma.coreforms import PasswordForm +from paramecio.citoplasma.i18n import I18n from bottle import request # Need unittest @@ -38,9 +40,24 @@ def show_form(post, arr_form, t, yes_error=True, modelform_tpl='forms/modelform. return t.load_template(modelform_tpl, forms=arr_form) +#Simple Function for add repeat_password form to user model + +def set_extra_forms_user(user_admin): + + user_admin.fields['password'].required=True + user_admin.fields['email'].required=True + + user_admin.create_forms(['username', 'email', 'password']) + + user_admin.forms['repeat_password']=PasswordForm('repeat_password', '') + + user_admin.forms['repeat_password'].required=True + + user_admin.forms['repeat_password'].label=I18n.lang('common', 'repeat_password', 'Repeat Password') + #Function for initial values for necessary fields. def ini_fields(fields): pass - \ No newline at end of file + diff --git a/paramecio/cromosoma/webmodel.py b/paramecio/cromosoma/webmodel.py index 1fbbed4..95801cc 100644 --- a/paramecio/cromosoma/webmodel.py +++ b/paramecio/cromosoma/webmodel.py @@ -801,6 +801,17 @@ class WebModel: self.forms=new_dict + def show_errors(self): + + error_txt='' + + for k_error in self.fields_errors.values(): + + for error in k_error: + error_txt+=error+"\n" + + return error_txt + @staticmethod def close(): WebModel.make_connection=SqlClass.connect_to_db diff --git a/paramecio/modules/admin/index.py b/paramecio/modules/admin/index.py index 8499fe7..3bceb4b 100644 --- a/paramecio/modules/admin/index.py +++ b/paramecio/modules/admin/index.py @@ -12,7 +12,7 @@ from settings import config_admin from paramecio.citoplasma.lists import SimpleList from paramecio.citoplasma.generate_admin_class import GenerateAdminClass from paramecio.citoplasma.httputils import GetPostFiles -from paramecio.cromosoma.formsutils import show_form, pass_values_to_form +from paramecio.cromosoma.formsutils import show_form, pass_values_to_form, set_extra_forms_user from paramecio.cromosoma.coreforms import PasswordForm from importlib import import_module, reload from bottle import redirect @@ -304,7 +304,7 @@ def logout(): redirect('/'+config.admin_folder) - +""" def set_extra_forms_user(user_admin): user_admin.fields['password'].required=True @@ -317,10 +317,10 @@ def set_extra_forms_user(user_admin): user_admin.forms['repeat_password'].required=1 user_admin.forms['repeat_password'].label=I18n.lang('common', 'repeat_password', 'Repeat Password') +""" - - """user_admin.create_forms() +"""user_admin.create_forms() users=user_admin.select()"""