diff --git a/servicePoints/views/__pycache__/accounts.cpython-36.pyc b/servicePoints/views/__pycache__/accounts.cpython-36.pyc index 28ab0735e78e2808b8f069d2edec5a2b1e3805c8..8d68f269c8a49b7934f908bc8884916922c227eb 100644 Binary files a/servicePoints/views/__pycache__/accounts.cpython-36.pyc and b/servicePoints/views/__pycache__/accounts.cpython-36.pyc differ diff --git a/servicePoints/views/accounts.py b/servicePoints/views/accounts.py index e17833941499096cc9aef23ff18905dda90ac6f1..0e38fd8a55ad9b02e6a19af923effdb4b9dfb146 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 c0d7d6f2b7cf457728391761dc4becc3a07bdcc0..540be41e3f075f6619d20ff958047e370134d7b2 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 Binary files a/var/servicePoints.sqlite3 and b/var/servicePoints.sqlite3 differ