From 53935831807e81916d0f891e0582147fd683f2b2 Mon Sep 17 00:00:00 2001
From: Antonio de la Rosa <antonio.delarosa@salirdelhoyo.com>
Date: Tue, 2 Dec 2025 23:21:19 +0100
Subject: [PATCH] Fixes and cleaning code

---
 cuchulu/console.py                 | 8 ++++----
 cuchulu/libraries/db/corefields.py | 4 ++--
 cuchulu/libraries/sessionplugin.py | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/cuchulu/console.py b/cuchulu/console.py
index 15917ef..54047f3 100644
--- a/cuchulu/console.py
+++ b/cuchulu/console.py
@@ -8,7 +8,7 @@ import re
 from pathlib import Path
 from base64 import b64encode
 from cuchulu.libraries.db.webmodel import WebModel
-from cuchulu.modules.admin2.models.admin import UserAdmin2, LoginTries2
+from cuchulu.modules.admin2.models.admin import UserAdmin, LoginTries
 from subprocess import call
 from urllib.parse import urlparse
 
@@ -223,9 +223,9 @@ def start():
         
         conn=WebModel.connection()
         
-        useradmin=UserAdmin2(conn)
+        useradmin=UserAdmin(conn)
         
-        logintries=LoginTries2(conn)
+        logintries=LoginTries(conn)
         
         # Check if db exists
         
@@ -272,7 +272,7 @@ def start():
                         f.close()
                     
                     #config_text=config_text.replace("modules=['cuchulu.modules.welcome']", "modules=['cuchulu.modules.welcome', 'cuchulu.modules.lang']")
-                    config_text=config_text.replace("apps={'welcome': ['cuchulu.modules.welcome', 'welcome_app', '/'], 'lang': ['cuchulu.modules.lang', '', '']}", "apps={'welcome': ['cuchulu.modules.welcome', 'welcome_app', '/'], 'lang': ['cuchulu.modules.lang', '', ''], 'admin2': ['cuchulu.modules.admin2', 'admin_app', '/admin/']}")
+                    config_text=config_text.replace("apps={'welcome': ['cuchulu.modules.welcome', 'welcome_app', '/'], 'lang': ['cuchulu.modules.lang', '', '']}", "apps={'welcome': ['cuchulu.modules.welcome', 'welcome_app', '/'], 'lang': ['cuchulu.modules.lang', '', ''], 'admin': ['cuchulu.modules.admin', 'admin_app', '/']}")
                     
                     with open(path_settings+'/config.py', 'w') as f:
                         
diff --git a/cuchulu/libraries/db/corefields.py b/cuchulu/libraries/db/corefields.py
index 7e8b90b..042923c 100644
--- a/cuchulu/libraries/db/corefields.py
+++ b/cuchulu/libraries/db/corefields.py
@@ -377,8 +377,8 @@ class BooleanField(IntegerField):
         
         required=False
         
-        self.yes_text=I18n.lang('common', 'yes', 'Yes')
-        self.no_text=I18n.lang('common', 'no', 'No')
+        self.yes_text=_('Yes')
+        self.no_text=_('No')
         
         super(IntegerField, self).__init__(name, size, required)
     
diff --git a/cuchulu/libraries/sessionplugin.py b/cuchulu/libraries/sessionplugin.py
index 369eb5a..ef90b77 100644
--- a/cuchulu/libraries/sessionplugin.py
+++ b/cuchulu/libraries/sessionplugin.py
@@ -83,7 +83,7 @@ def get_session():
     
     """Function for get the session from request object from bottle"""
     
-    return request.environ.get('session')
+    return request.environ.get('session', Session())
 
 def session_plugin(callback):