From d931ed0a114b340b320f2648dd0f2a1c9580a2d5 Mon Sep 17 00:00:00 2001 From: Allie Bopp <aebopp@umich.edu> Date: Tue, 14 Jul 2020 18:06:19 -0400 Subject: [PATCH] when member deletes account, their pending points requests are deleted too --- .../views/__pycache__/accounts.cpython-36.pyc | Bin 14564 -> 14664 bytes servicePoints/views/accounts.py | 5 ++++- sql/schema.sql | 2 ++ var/servicePoints.sqlite3 | Bin 32768 -> 32768 bytes 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/servicePoints/views/__pycache__/accounts.cpython-36.pyc b/servicePoints/views/__pycache__/accounts.cpython-36.pyc index 28ab0735e78e2808b8f069d2edec5a2b1e3805c8..8d68f269c8a49b7934f908bc8884916922c227eb 100644 GIT binary patch delta 355 zcmaD-c%q2Qn3tC;L5nXwF>)i<DwFyH3=9k@j3o?NjM;2O8$fglqa;Hu1CYg(#hk*F z%~TYT!VKoI09DukS*$?Jmcr7^*vuHrkOJZ{Wr5@(;Bssbxf1p)jx5e*hFZoN#w@NB z_7sj9hD^q0rdp;NrYvrtICD)sa|$QWIu@`3E}#MyumaW^)+`>N0=62K8nzmS6z)09 zwd^IlDSS2TeLzd$7V$zX(&YCmVgq`lhy_Gs0EsAp<ovv}%%WVE)ST3kRR5y%qA-xK zFjP1wH8;O3)i;$THz~DfvVyS5<Y}fUqD5LjHJXe?Q$Q475kHVB5}4c}FFV;(hkx>G lb*{<QW|90#Kw$<ZE=Dd!9v~E$JlE_E<Dbo4=8=qyVgOJSSET>| delta 212 zcmX?6^rVo>n3tDpy#`<W(uj>*t4xe%FfcHrFqSZ6F=n$Bb%5v;MoETR1|W+mi#dfU zo2keE$Yudz))eMu#%9Lg$(%+yK8#tMDeNh%H7uEo%}lkdHLO|O%?!0{H7qr3H4G^n zbC_${OL$VaYS{Z2gF%KN8^EB+?N`JGw77@`L}*Qx6*iyz$}~klld)(DP(+irh#w>& oFgZ?9VzQ|Y|KxtNWKJ2N5CanzBiCd`^EZq?H@`EFWMmWu0M8>bdH?_b diff --git a/servicePoints/views/accounts.py b/servicePoints/views/accounts.py index e178339..0e38fd8 100644 --- a/servicePoints/views/accounts.py +++ b/servicePoints/views/accounts.py @@ -488,7 +488,10 @@ def manageOrg(): if 'username' in flask.session: username = flask.session["username"] if flask.request.method == 'POST': - return flask.redirect(flask.url_for('login')) + if 'delete' in flask.request.form: + return flask.redirect(flask.url_for('confirmDeleteOrg')) + if 'remove' in flask.request.form: + return flask.redirect(flask.url_for('confirmRemoveMember')) cursor = servicePoints.model.get_db() leaderCur = cursor.execute('SELECT orgName FROM orgs WHERE ' 'username =:who', diff --git a/sql/schema.sql b/sql/schema.sql index c0d7d6f..540be41 100644 --- a/sql/schema.sql +++ b/sql/schema.sql @@ -30,4 +30,6 @@ CREATE TABLE requests( service VARCHAR(40) NOT NULL, filename VARCHAR(64) NOT NULL, PRIMARY KEY(postid) + FOREIGN KEY(member) REFERENCES users(username) ON UPDATE CASCADE + ON DELETE CASCADE ); \ No newline at end of file diff --git a/var/servicePoints.sqlite3 b/var/servicePoints.sqlite3 index 2464e2f347f64a8f0b2bbd3fcfb11d062973c0a2..7e902472bdd1db5dde5b5971e4e42731a9aee50f 100644 GIT binary patch delta 488 zcmZWkO=}ZD7@kcJ*-g4T^i-C#FhURQMRw;Sy8|MG%~VB6L+V!x9%g6WRD@JW5O10k ze}KWe-g;JZ_aKNTe}#A{h2BDrj`0w|_wc~`e8DpwSH|PY+lJ>)w~B_3u5Wz|@d8!r z3lx3FKcda(eRwmxs4qTEUe#-7MYX!Qz3sg@dUw43^HD&^{y|UOxz!<e)zR(%1|<yl zNKfsnp6V3pkh~bdaJ2gePxS!y$U%oZ=(bz;6)9SWMXRl9LEyNyx~Ep$>_+&lQb!1R zSRgE-(d-&|7I|N%lP|9)w>>|0clN|Tg_qBVC;#K<sTL{S;fyskO_H?Kl=nH+Ix*bJ zl;;$rmaxN{3FLX2QZUjba>2?h$&GuY&MfpZ*8)O=VN!A?q?MXI29sM5#`bk-Y{Jr9 zGLc9SoTVm}z$Mor$+V-&z5r>PR9Xh6=>);4%rlymE~c%aytbS;M|h6svyJXA9Q%$z u!CD;rT@@}3R|sD%<p%cF;`raes|IJd#I;rQb2lK~`D`QkfW71C<l%4ZVu>~Y literal 32768 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Ǧ(s$k7L7T#|4 zaijWE^`Gju)yLJ}sy|krRR6k+^_XlX0z`la5CI}U1c(3;AOb{y2oM1xaOnxmxBAWL zP;a->TB@6!#n#Hn2wgq!I9vCa4%A)gww9aqpjW%@ayD$#s`u9;Ei>I#Z*DSJv4CLO z)hCVW-_>8MPq9H05g-CYfCvx)B0vO)01+SpM1Tko0V43FB2cwk{r+@JV7gpvwfent z@9Hegv{w3OxBu7)UqiauZ1t8W_x|;J3ib2<cJ=2*^?CL8>Yv!4i3kt@B0vO)01+Sp zM1Tko0U|&IhyW3|Gz89G7iiD5dd-9SPj^};J8=+Trqf!UtMC8o=l}Rm|7aotM1Tko z0U|&IhyW2F0z`la5CI}U1ir!q>gWG-|Nj*hm|P<QM1Tko0U|&IhyW2F0z`la5CI~9 v1Wup-S2wB~1cV3>0U|&IhyW2F0z`la5CI}U1c(3;cohP_dzDUKsy_b(+!8a$ -- GitLab