From 1f3e391fc40eceeaa9a8673761f43d54848589f9 Mon Sep 17 00:00:00 2001 From: Adam Drake <drakeadam02@gmail.com> Date: Thu, 2 May 2024 01:25:14 +0100 Subject: [PATCH] fixed bug with AI profiles and userprofiles not being properly created --- .../__pycache__/forms.cpython-310.pyc | Bin 1193 -> 1185 bytes .../__pycache__/views.cpython-310.pyc | Bin 7207 -> 7242 bytes prediction_service/forms.py | 2 +- prediction_service/views.py | 7 ++++--- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/prediction_service/__pycache__/forms.cpython-310.pyc b/prediction_service/__pycache__/forms.cpython-310.pyc index 652e31d73c46f97533467bb7939be82466183871..87e6316e37c8ebcfd756aff190c90623093425ce 100644 GIT binary patch delta 43 zcmZ3<xsa19pO=@5fq{Wx#_f$<nv6ofxE(zeT=UX1^HNibir5(#7&iMd#xMf_@xu!l delta 51 zcmZ3;xssDBpO=@5fq{V`r)ndYCZp6X?!?Ua)V%b}ywud9DsD$l1y?9%vnyi^GXP<d B4(<Q| diff --git a/prediction_service/__pycache__/views.cpython-310.pyc b/prediction_service/__pycache__/views.cpython-310.pyc index e6336417a5b6bdf19b05b40494f4f6ed9448aeec..5c08f782f32a42bb8aa06bec6bfd83129caa0bfa 100644 GIT binary patch delta 599 zcmZ2(ams=>pO=@5fq{YH?j57FsT+CgnHhg=?q%j+WE7t~jm45tX7UA=iHvfSlUN-U zjxaDV)G%Z*q%dYP6@`~D)-Yr-H8a*S)-Wz$UdT`sHu*4XX+6&Z-WrA!o*I_f3@O}m znHMrKGL-P8@HR6BGvqOsFg7#PGM4byFr@IM@YgVAGBz^@GiVC<-C_yw4-UD-QCgf@ zl$V&BS|rWDz@W)gB+kIV0A_<(D;dF5kr)F5gBw)#7H?*8d}3)yMt)IdRcgxQ)ohZy zRop@OIjIU|i8-aI3X_kpS#V2&%;5kLN|V{y)g|OXOg;t%hFfgOMX8A;sYMDP5yi=F z>>Au)OO-)<>B*Js`ix4GSF%fUh%j<6GJRkZntX~~kx_B-8}{egN+2~Lg||2g5{rw= z^NUh6nTkLHMMfYgkUNW17#J9;!Y4OyOHG#GTqzHB30R{JNQnW6kOC1P9~UW3e!yv9 zfiMB&lql}R%=py2^vt}})S@CGkXkSy401lVuaBc+aC}aFdS+h4WCyOVf*`ZqG#PKP zCFkenW|kC*O?Kn%(*av+2GR?XFVY0Dv_J&NhFffq04#zyWD-v-W9jBNp5u&+N}JXA q)^IUOZoVvG$jCTxGpm#Yqo@o>pB#t)2O~7(jHE9xN={~$Q2_u&Ns3tj delta 548 zcmX?QvD|_;pO=@5fq{YH?oFe#@Qu9n%#2l=dzm>H8O0_~W3gnEo_v92BBSi&Bvwa- z4GatnH4Iq{DU8`nMZP7BH4Iry&5X5-HH-_G7cvz2Og_w7n#h;J)65vmkjGrY*vwGN zSi)b!kiwh7SHqae*vuTvpvmudizUE6IOG;bX>n>%USe))krV?1gC<jv7y|<Xm<?vF zWCT;UxDzwuQ}fa@^HNib+(4=(FJ;r7e3#9FTLPq>14JlJR$y0`kOMLK7#J9Cu_YI! zCYGcY$%8}`CdadDaDxq30`a9LPh!_sQea?U;9}%r<Y44r<YDAt6kz6H7GUIH6krr# z;$UR@$R;@XDZ3)0!en-i=W2=|eIU)ZI0_Pri_7ziQZ$*0KmtWZASo3Pp*&fH^MpLu zQDF5tAVC8VAqgTto-9(B{F~Fj0HG1=DzI)LkQy){4DtcDuaBc+aC}aFdS+hu<Yca| zf*>>9G#PKPCFkenW|kDGOwQ!)(*av&2GR?XFVY0Dv_J&N<Xdcsr6n2pMMV$?OjhQJ zWh~j;$a9>LQE{^;-x@APiOt_63>g_GY}SyHU}Td9X_TGpC@nlWQu+*|#AG!Y6#%Nc BcZmQ1 diff --git a/prediction_service/forms.py b/prediction_service/forms.py index c37aa3d..71d460d 100644 --- a/prediction_service/forms.py +++ b/prediction_service/forms.py @@ -4,7 +4,7 @@ from django.contrib.auth.models import User class UserRegisterForm(UserCreationForm): email = forms.EmailField() - role = forms.ChoiceField(choices=[('user', 'User'), ('ai_engineer', 'AI Engineer')], widget=forms.RadioSelect) + role = forms.ChoiceField(choices=[('user', 'User'), ('AI Engineer', 'AI Engineer')], widget=forms.RadioSelect) class Meta: model = User diff --git a/prediction_service/views.py b/prediction_service/views.py index 852e7a0..4024f7d 100644 --- a/prediction_service/views.py +++ b/prediction_service/views.py @@ -67,10 +67,11 @@ def register(request): # Create EndUser if role is 'user' if role == 'user': EndUser.objects.create(user=user_profile) - elif role == 'ai_engineer': + elif role == 'AI Engineer': AIEngineer.objects.create(user=user_profile, is_authorized=False) messages.success(request, f'Account created for {username}!') + messages.success(request, f'Role value {role}!') return redirect('MLAAS-login') else: form = UserRegisterForm() @@ -92,7 +93,7 @@ def MLAAS_login(request): if user is not None: try: - if user.userprofile.role == 'ai_engineer': + if user.userprofile.role == 'AI Engineer': ai_engineer = AIEngineer.objects.get(user=user.userprofile) if not ai_engineer.is_authorized: messages.error(request, 'You are not authorized to access the MLaaS system. Please wait for admin authorization.') @@ -122,7 +123,7 @@ def create_post(request): post.author = request.user # Check if the user is an AI engineer or an admin - if request.user.userprofile.role == 'ai_engineer' or request.user.is_superuser: + if request.user.userprofile.role == 'AI Engineer' or request.user.is_superuser: post.save() messages.success(request, 'Your post has been created successfully.') return redirect('MLAAS-home', pk=post.pk) # Redirect to the post detail page -- GitLab