From 0a3a35bf1bd7743381c45eae664777389bd74b31 Mon Sep 17 00:00:00 2001 From: Tom Price Date: Thu, 15 Oct 2015 13:38:24 +0100 Subject: [PATCH] Setup useradminform correctly for profiles enabling admins to change passwords. --- .idea/dataSources.ids | 836 ------------------------------------------ .idea/modules.xml | 5 +- RIGS/admin.py | 28 +- RIGS/forms.py | 13 +- db.sqlite3 | Bin 19730432 -> 19730432 bytes 5 files changed, 39 insertions(+), 843 deletions(-) delete mode 100644 .idea/dataSources.ids diff --git a/.idea/dataSources.ids b/.idea/dataSources.ids deleted file mode 100644 index 748b0aa7..00000000 --- a/.idea/dataSources.ids +++ /dev/null @@ -1,836 +0,0 @@ - - - - - - - - - - - - - - - -
- - - - - - - - -
- - - - - - - - - - - - - - - - - - - -
- - - - - - - - - -
- - - - - - - - - -
- - - - - - -
- - - - - - - - - -
- - - - - - - - - - -
- - - - - - - - - - - - - - -
- - - - - - - - - -
- - - - - - -
- - - - - - -
- - - - - -
- - - - - - - - - - - - -
- - - - - - - - - - - - - - - -
- - - -
- - - - #@ - ` - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - -
- - - -
- - - - - - - - - - - - - - - - - - - - -
- - - - - - - - -
- - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - -
- - - -
- - - - - -
- - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - -
- - - - - - - - - -
- - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - -
- - - - - - -
- - - -
- - - -
- - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - -
- - - - - - - -
- - - - - - -
- - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - -
- - - - - -
- - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - -
- - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
- - - - - - - - -
- - - - - - - - -
- - - - - - - - - - -
- - - - - - - - - - -
- - - - - - - - - - - - -
- - - - - - - - - - - - - - - -
- - -
- - - - - - - - - -
- - - - - - - -
- - - - - - -
- - - - - - -
- - - - - - - - - - - - - - - - - -
- - - - - - - - - -
- - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml index cac4e07c..75e2a525 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,8 +2,7 @@ - + - - + \ No newline at end of file diff --git a/RIGS/admin.py b/RIGS/admin.py index 37f35a8b..18dc554e 100644 --- a/RIGS/admin.py +++ b/RIGS/admin.py @@ -1,9 +1,10 @@ from django.contrib import admin -from RIGS import models +from RIGS import models, forms +from django.contrib.auth.admin import UserAdmin +from django.utils.translation import ugettext_lazy as _ import reversion # Register your models here. -admin.site.register(models.Profile) admin.site.register(models.Person, reversion.VersionAdmin) admin.site.register(models.Organisation, reversion.VersionAdmin) admin.site.register(models.VatRate, reversion.VersionAdmin) @@ -11,4 +12,25 @@ admin.site.register(models.Venue, reversion.VersionAdmin) admin.site.register(models.Event, reversion.VersionAdmin) admin.site.register(models.EventItem, reversion.VersionAdmin) admin.site.register(models.Invoice) -admin.site.register(models.Payment) \ No newline at end of file +admin.site.register(models.Payment) + +class ProfileAdmin(UserAdmin): + fieldsets = ( + (None, {'fields': ('username', 'password')}), + (_('Personal info'), { + 'fields': ('first_name', 'last_name', 'email', 'initials', 'phone')}), + (_('Permissions'), {'fields': ('is_active', 'is_staff', 'is_superuser', + 'groups', 'user_permissions')}), + (_('Important dates'), { + 'fields': ('last_login', 'date_joined')}), + ) + add_fieldsets = ( + (None, { + 'classes': ('wide',), + 'fields': ('username', 'password1', 'password2'), + }), + ) + form = forms.ProfileChangeForm + add_form = forms.ProfileCreationForm + +admin.site.register(models.Profile, ProfileAdmin) diff --git a/RIGS/forms.py b/RIGS/forms.py index 922558c3..24773475 100644 --- a/RIGS/forms.py +++ b/RIGS/forms.py @@ -3,7 +3,7 @@ from django import forms from django.utils import formats from django.conf import settings from django.core import serializers -from django.contrib.auth.forms import AuthenticationForm, PasswordResetForm +from django.contrib.auth.forms import UserCreationForm, UserChangeForm, AuthenticationForm, PasswordResetForm from registration.forms import RegistrationFormUniqueEmail from captcha.fields import ReCaptchaField import simplejson @@ -33,6 +33,17 @@ class LoginForm(AuthenticationForm): class PasswordReset(PasswordResetForm): captcha = ReCaptchaField(label='Captcha') +class ProfileCreationForm(UserCreationForm): + + class Meta(UserCreationForm.Meta): + model = models.Profile + + +class ProfileChangeForm(UserChangeForm): + + class Meta(UserChangeForm.Meta): + model = models.Profile + # Events Shit class EventForm(forms.ModelForm): datetime_input_formats = formats.get_format_lazy("DATETIME_INPUT_FORMATS") + settings.DATETIME_INPUT_FORMATS diff --git a/db.sqlite3 b/db.sqlite3 index 312d40402d39dc24dc83df96251c2fc3c375a0c0..b9c15eb2486ad3865b1617c12586ecd58a7f85bf 100644 GIT binary patch delta 3139 zcmcK6dvp}l9S88ab2r&!$(x605S9=O1PJrk*+)clVUv)M**w^gOh7ToZZ`YM=E-K4 zw&B%PER9laGp((mN^PsHmBzYll_a&arSyS)AuU=8KB<&~QYo62ekVc6@!;XF?m3_D zoU?Q1ckax+cjj*0`%LOqcpx`@lwsC77{=bhFs!s^ktJ!AS@s6q?^X;%KRjY6J&>bk zjSM|RAEGi%W=GgCYaE_+$iVi?`c%d~ohQo)D{#EDjOUi|l93mRMN6^36pO=O!+oMZ=$4Ou7Bk|-g``iV?_ z@YG9rS$cYep_k}8^lkbYJxY%ZXB~TvW+YRVFuV1WhveZ`ju$M-($O;v!`#|RKcMf? z^YqNsvX{h)r?VNR{PZ-$Iz6IRXF%I@b{@m}*m<;!9;bWgv+OY%WCvIWJ52M~q3pYt zkTVJNDu?vvQ<<2XC9&CU@mPb=Koo@NiTPqMq&P$GML(^_`$u46>sKQUnh z+m#6;nTkYCuyS0^TxusD&ZjG<#bQw^l1#kK!e?LeG;b-AtRm0bGC%3GXywctm+{eQ zF7a*#nejRygDDrtI^s%fyg)9pDNGv8Wu2bLJsU0(U=tfI(l=jK1P;IahB~J$yuLCj zyBv{xQRX|s^-4qa^18BKpUc^2t#N?&b791z$@`wTW9xeAKuQD3G2^4er0J6SA>VIg3RwOM*?}EZRdEzpR5KNCrKmKq?qu z8l*uwWI!flK{n*TbeI7%VHVr~v*AX#336c$+zfMJ9vERhb|GVLyByhT$3b0Xz!{_#ylVehkmS^Kbx0U=+sSC-4IN6b{1A;OFoQI0V0h!|*Hk zHT(vC3rFBZ_#ONn{s4c3KfzIW368;^;V*C;UWQlTuW$nX1}EVZyb7+lA=32(va z#Q5dE>&6V}cy$oEgP}XFev8zCEjdZ@wj}%Yz7#|IpD!f#nfQiJeI*NKv%s0-2j71D z;F%Xk_7;#ab|dQTOuueDIaJ|uIszsowkqiKxA|rNs*uyKL}kA>D%Z=BTwm&IbOZ$1 zQO-O4!GI#v2~O9Lv1}okBh?0-F)uGW6j2G4^Gc{D(&%Ur6~8^&STDzvdYPB~r6Fgi zE>h)ck(~aTh_k+Ks1w(=FZ7l7IsGNR)|%Tsdc#eVE}JsVg58CTE6)$?)n zow)jLT)hxi{}or?i>nvo>c8XarMUWjT>T)fj>pyi#MS@C)ywy(WI!dr0wp7=j_A*k zRii2QCJ_T+i_hObV^m!VHSjvO8Hg`j9xIr8`i|3hX zp87noVyavgRsaA1 delta 2112 zcmajgX;@TM9LMo{?wN6hVNnDT1$01g1Rb1x225p?MNv=|6`@oVaFo#zL~x0ewChrh z8s=QLa6wBeH`FOZK(j(yv{j2N#g)u8(o~Fo$9f(gU-jbiz2|xU=ehSh_sv?8vegl<&B!X8U1ms6Hd+V%dlI8sYf_wxZ}Mju{o|ir|ji zL@Vj#7gP~i5&C4^C8$3kR=-|cNT|h@7C&^9Jvps#ZuXpbn>i~zYe?zb@iXE_XU!Nh za!Q_~a8`0z=D2K}!l2gb)EbLYqm9)XWA&zJol&RJXgI4qe{N>+w8{4TdAatIV%Ldw zNm#f4hSu~1l@*p1yU@F*P8cc^mu)_?P2@aSAMNka0p#CS+4R1gttbsRSEx160b+8^b zz(&{vZ$TAohAprawm~&)haK=XyaPL77rYDa!TYcq_P}1)2m7H04!}V;1a9~MK7_;Y z5!AvFsDpZFfTM5>K8EA)3498lK_i@ilkhow0bjyba0*Vt*YFK|3*W)_@B^HIv+yJQ z1WoWWoP%HBS2zzBpcyX0CAbV%;3`~$7I$0wZ<2w7sS5=@qr*d6vRh@*d~aN1@Uh|Y+oS~r$~SYO6o)jk=-Uk>*dR& zL_zog1uOlRO9|3}MaCj$@nBJ~c(Qo0c(eGhbY$to;>*&R#gE0Gr3*^{OIMaamToNF zS%O%CSwdKPu=He6vV^jPvGigIXNh3xP3rxZtH|vDw`9$YTE2csZ4`+k&T19(fk;wU z9YrL8UX;i