From 1308039be5dd1071198ae06676c99ed262da8a7c Mon Sep 17 00:00:00 2001 From: Celestino Rey Date: Mon, 30 Sep 2024 19:44:32 +0200 Subject: [PATCH] Corregido error username --- JugarAlPadel/gestion_reservas/db.sqlite3 | Bin 147456 -> 147456 bytes .../eventos/migrations/0001_initial.py | 2 +- .../eventos/migrations/0002_initial.py | 2 +- .../gestion_reservas/eventos/models.py | 2 +- JugarAlPadel/gestion_reservas/eventos/urls.py | 3 +- .../gestion_reservas/settings.py | 8 +++- .../gestion_reservas/gestion_reservas/urls.py | 2 +- .../reymotausers/migrations/0001_initial.py | 2 +- .../gestion_reservas/reymotausers/tests.py | 41 +++++++++++++++++- 9 files changed, 53 insertions(+), 9 deletions(-) diff --git a/JugarAlPadel/gestion_reservas/db.sqlite3 b/JugarAlPadel/gestion_reservas/db.sqlite3 index 9a7d6505ea4b56b27f21e657ed78ea66ab0a560a..42a7b85d7b1b68b66793c729c5e075e47ad906fc 100644 GIT binary patch delta 1396 zcmah|OHUhD7@ffdI#u8{eMC{r!vd0x<>B6$d*?-I;|Bs84E6*+097u*<0tkQk3Gg9 z1e71pR68k99b)u74~q^crue!F$23yBaS0-c-gH;@2Tl@MpaJ>6wN zS}0@Z*iBwT3a?-lLecrfJ<)|^BB?}lt_^v+5FrxPcV>n@=|ZA_6ahJ34dE^%2nxoE zb2=nq3gC$O>})9PU_^dFqSE(2+-^ zE=y7rf&^!G1P@$>BlASX)amylN|!_gQIb@rXS8Ep<}pOFC_4+I<6V{@6Nrhk_ZACE zl%zOMM!k1B>gO>_!T>mC-UU-V;4%0eRKWu<1&%-*{CILW4jgUrMz6cyHO(DwO|dsW z{m|v|vg^%8AyYHzm7--8&8p{vK9`p>Y@^yRtxVmpjJmzfFwDpFyZStQFqwvZELdj1 z^2uQYILqevTF_ppgT$6tH4}Nh@Yci4_=)+bEXR z>&ZgOU(JUXx0m%mC^0QS0sElp6QKvmnus(c@)yB9H3fRy83WE9UO)I19G&eyI@@Of zWcwfe^&NZd{dZ0oa7wqHfGHo_$J};{Y|Pv-Jz29-tme&T)l;L(3wZ>6Q1T$C!SnZ{ z0oqv)$TQ#vkUu$G1N(^{jsZ)Ym*xCuqi(b}&6=@ux4m94P2R9PKF{02YrA9X*{qQr z(>%L-d!P4TZ2)5pVqT=ftO$2mDtr4<_CFN*Cay}*46w=zf+$1vJ!+K&uNd%(cKQdn zPM0nh$NdX@-WUsBFyIAc{{+0FY%k;IxU2FVhk`8Qi-N&t%;2+=!_&e2FUQ#4=+QmD zWK=c_rOJ-2)N?j5tZKWM%hw8JQmt2|mZ|VYWII`!nOSNT{c+vM1cicsB~i>b#k4gW zwHBkbRLx8@YDui3M!8L(kN$i)6pbJ$Rc>rlHuTNa^lCP}nQh0S3sQLw2Xm=yX@7Yq z8Of5!95j7f`l8r2QmPNZObgF9>I>;mc|JZL39Dg!DPAJ2MSWFS4bSP(sJ=B9+bHB= zGPDw0DV4;0t{PD6xSmTBe||Q!6f!kr+4D1&W*0-jW;g{iO}U2dE1@=Q&BB?=VmXWq zeF5bRxp04utOga~UaK=X2zLe(^AJl!QZCbf&Vc7M=BI!kcSX7Xi|n%IB?Dg4nxDbQ Ou*-jWFLXBldBWd@Vsak< delta 1929 zcmcIlTWcFf6yBARRBB^SN-l(0zF?a`5s`OhFS9Gxq_VEIWXaaWmK4fX(ynD)ccooj zLy(>PfVS*I{y__ELgNNvLQ5VRXdeoJmgc1`6iT6x=RWnRYnwz)+K~340}IQ?ch33d zn{#Hix9!{8_7BEL^r6E`qTTn}7e*O36x@(=@jT{`VElIB;t`1A5Hik>9f3HW!@Ln0 zTNtu9NMX*nImQklmd2c5{5Uo{gcwNEjB(Q8970H-dCKrR-X22GjKjwJ4(13%3A|u@ z=fFdVVks6I=f>xsL0I6CSy3E!AAul+DC6Vt%R`7~A;iWX<3p(!^8$nhp5TTo%nD}U z)d^yk=b>Z#L%1^Or5BtyU+QYw25} zDmQB-O)Dw&DS{x*nBQ~j^a+zFx8=I7Xkt^=qvq0G9JvRGUHD8f7k*ICu5X;SS)c%^y2BO(yE!EBOX;oU!uw`GllnTynG?NWZ z?*x>H-=nFmMj*~;jkRE5(~Xgs$T)en020fiCD{xCxg8w0}@cAZST*|$djjzJtn|oGwxe} z-y%;CXJ=?~Rp~2gvs9CtQ>yuUP#IE}C~m(pqTDQdX2d)v3+NHxYtY->sewV*Vkf}7 z-AUR#=q0tUT%FEIk}OTTr>x6eUz(sG>e*zGSwA~%g(JYodQPLlsjK(tGs zDFM+3TOPSbjQ%uoZ+GXDk-_z8%kh;P2~S?>W4 zqav$ZIo4~GeVETw%5aVL$Ana#8o)?{*LY20Qf(>LYW7f#MeDTKVZy>@SdZnxFc4V^ z1pD4Zlq+Z`m-Z*CUXLdc&n%WCFQZePSd7nh*9wdMP;q5TPh*c*OvStvH`LmpwW_N86L-5qo`_Jg^Cw zSE!`xQor8KH`M%QMbYF+O&4TNQ<{2J`mZ(({-safCc)tbJlH>kERv67=XpRX@=p3c&tP3A1o(0sf&Owq3&Ow=9$eg=DH%YF({ zv(^>zRlQ}Iv98!(/', views.reservar_evento, name='reservar_evento'), + path('reservar//', + views.reservar_evento, name='reservar_evento'), ] diff --git a/JugarAlPadel/gestion_reservas/gestion_reservas/settings.py b/JugarAlPadel/gestion_reservas/gestion_reservas/settings.py index 8a71a28..d5f058f 100644 --- a/JugarAlPadel/gestion_reservas/gestion_reservas/settings.py +++ b/JugarAlPadel/gestion_reservas/gestion_reservas/settings.py @@ -21,7 +21,7 @@ BASE_DIR = Path(__file__).resolve().parent.parent # See https://docs.djangoproject.com/en/5.1/howto/deployment/checklist/ # SECURITY WARNING: keep the secret key used in production secret! -SECRET_KEY = 'django-insecure-yft$kjzba+%i*%^n2u-i(3+tgvjitx%3we3y9l1pts$h3r#)ow' +SECRET_KEY = 'hey' # SECURITY WARNING: don't run with debug turned on in production! DEBUG = os.environ["DEBUG"] == 'True' @@ -142,8 +142,12 @@ LOGIN_REDIRECT_URL = 'principal' LOGOUT_REDIRECT_URL = 'principal' AUTH_USER_MODEL = "reymotausers.ReyMotaUser" + +AACCOUNT_AUTHENTICATION_METHOD = 'email' +ACCOUNT_EMAIL_REQUIRED = True +ACCOUNT_UNIQUE_EMAIL = True ACCOUNT_USER_MODEL_USERNAME_FIELD = None -ACCOUNT_USERNAME_REQUIRED=False +ACCOUNT_USERNAME_REQUIRED = False MEDIA_ROOT = BASE_DIR / "mediafiles" MEDIA_URL = '/media/' diff --git a/JugarAlPadel/gestion_reservas/gestion_reservas/urls.py b/JugarAlPadel/gestion_reservas/gestion_reservas/urls.py index 8c53567..cb4a529 100644 --- a/JugarAlPadel/gestion_reservas/gestion_reservas/urls.py +++ b/JugarAlPadel/gestion_reservas/gestion_reservas/urls.py @@ -19,6 +19,6 @@ from django.urls import path, include urlpatterns = [ - path('admin/', admin.site.urls), + path('obreros/', admin.site.urls), path("", include('eventos.urls')), # new ] diff --git a/JugarAlPadel/gestion_reservas/reymotausers/migrations/0001_initial.py b/JugarAlPadel/gestion_reservas/reymotausers/migrations/0001_initial.py index b8c6372..89bcdbd 100644 --- a/JugarAlPadel/gestion_reservas/reymotausers/migrations/0001_initial.py +++ b/JugarAlPadel/gestion_reservas/reymotausers/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 4.2 on 2024-09-30 14:19 +# Generated by Django 4.2 on 2024-09-30 17:28 from django.db import migrations, models diff --git a/JugarAlPadel/gestion_reservas/reymotausers/tests.py b/JugarAlPadel/gestion_reservas/reymotausers/tests.py index 7ce503c..5ed29fe 100644 --- a/JugarAlPadel/gestion_reservas/reymotausers/tests.py +++ b/JugarAlPadel/gestion_reservas/reymotausers/tests.py @@ -1,3 +1,42 @@ +from django.contrib.auth import get_user_model from django.test import TestCase -# Create your tests here. + +class UsersManagersTests(TestCase): + + def test_create_user(self): + User = get_user_model() + user = User.objects.create_user(email="normal@user.com", password="foo") + self.assertEqual(user.email, "normal@user.com") + self.assertTrue(user.is_active) + self.assertFalse(user.is_staff) + self.assertFalse(user.is_superuser) + try: + # username is None for the AbstractUser option + # username does not exist for the AbstractBaseUser option + self.assertIsNone(user.username) + except AttributeError: + pass + with self.assertRaises(TypeError): + User.objects.create_user() + with self.assertRaises(TypeError): + User.objects.create_user(email="") + with self.assertRaises(ValueError): + User.objects.create_user(email="", password="foo") + + def test_create_superuser(self): + User = get_user_model() + admin_user = User.objects.create_superuser(email="super@user.com", password="foo") + self.assertEqual(admin_user.email, "super@user.com") + self.assertTrue(admin_user.is_active) + self.assertTrue(admin_user.is_staff) + self.assertTrue(admin_user.is_superuser) + try: + # username is None for the AbstractUser option + # username does not exist for the AbstractBaseUser option + self.assertIsNone(admin_user.username) + except AttributeError: + pass + with self.assertRaises(ValueError): + User.objects.create_superuser( + email="super@user.com", password="foo", is_superuser=False) \ No newline at end of file