diff --git a/__init__.py b/__init__.py index cc9022b..90c6036 100644 --- a/__init__.py +++ b/__init__.py @@ -61,9 +61,9 @@ def workshop(): if request.method == 'POST': if 'NewScenarioName' in request.form: newScenarioName = request.form['NewScenarioName'] - triggerName = request.form['TriggerName'] + triggerName = request.form['TriggerID'] triggerArgs = request.form['TriggerArgs'] - actionName = request.form['ActionName'] + actionName = request.form['ActionID'] actionArgs = request.form['ActionArgs'] db_routing.add_scenario(current_user.get_id(), newScenarioName, triggerName, triggerArgs, actionName, actionArgs) @@ -74,7 +74,10 @@ def workshop(): db_routing.tg_username_update(current_user.get_id(), new_tg_username) return redirect(url_for('workshop')) - # if 'NewScenarioName' in request.form: + if 'ScenarioID' in request.form: + scnarioID = request.form['ScenarioID'] + db_routing.delete_scenario(scnarioID) + return redirect(url_for('workshop')) triggers_list = db_routing.get_trigers() actions_list = db_routing.get_actions() @@ -88,9 +91,9 @@ def workshop(): user_scripts_list=user_scripts_list, tg_username=tg_username) -# @app.errorhandler(Exception) -# def universal_error(error): -# return render_template('error.html'), 404 +@app.errorhandler(Exception) +def universal_error(error): + return render_template('error.html'), 404 def string_check(string): diff --git a/db_routing.py b/db_routing.py index 7716663..bf30fdb 100644 --- a/db_routing.py +++ b/db_routing.py @@ -97,6 +97,7 @@ def get_user_scripts(current_user_id): def delete_scenario(scenario_id): + print(scenario_id) scenario = Scenario.query.filter_by(id=scenario_id).first() db.session.delete(scenario) db.session.commit() diff --git a/templates/workshop.html b/templates/workshop.html index b2f2a99..64641b1 100644 --- a/templates/workshop.html +++ b/templates/workshop.html @@ -60,7 +60,7 @@