From aa2c61cd0f07f5e4354765f7cb1080141dfab0a0 Mon Sep 17 00:00:00 2001 From: Kenneth Jao Date: Sun, 15 Apr 2018 22:03:14 -0400 Subject: [PATCH] fixed phoneme_remove functions --- SmearcarDB/server.py | 10 +++++----- SmearcarDB/static/index.js | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/SmearcarDB/server.py b/SmearcarDB/server.py index 8a532d7..73c1fcf 100644 --- a/SmearcarDB/server.py +++ b/SmearcarDB/server.py @@ -98,19 +98,19 @@ def phoneme_remove(info): """Remove a phoneme from a language.""" # info = { # language_id: language_id, - # phoneme_id: phoneme_id + # phoneme: phoneme_name # } - phoneme = Phoneme.query.filter_by(id=info['phoneme_id']).first() + phoneme = Phoneme.query.filter_by(name=info['phoneme']).first() language = Language.query.filter_by(id=info['language_id']).first() frequency = Frequency.query.filter_by( - phoneme_id=info['phoneme_id'], language_id=info['language_id']).first() + phoneme_id=phoneme.id, language_id=info['language_id']).first() - if Frequency.query.filter_by(phoneme_id=info['phoneme_id']).count() == 1: + if Frequency.query.filter_by(phoneme_id=phoneme.id).count() == 1: # Delete phoneme db.session.delete(phoneme) language.phonemes = [frequency for frequency in language.phonemes - if frequency.phoneme_id != info['phoneme_id']] + if frequency.phoneme_id != phoneme.id] db.session.delete(frequency) diff --git a/SmearcarDB/static/index.js b/SmearcarDB/static/index.js index 3342f48..193f391 100644 --- a/SmearcarDB/static/index.js +++ b/SmearcarDB/static/index.js @@ -678,7 +678,7 @@ document.querySelectorAll("#editLanguageSubmit p")[0].onclick = function() { action: "phoneme_remove", data: { language_id: langInfo.id, - phoneme_id: diffRemove[i] + phoneme: diffRemove[i] } }) })