converted over to a flat settings table, no more key-value pairs of settings

settings.py

@@ -1,4 +1,4 @@
-from wtforms import SubmitField, StringField, HiddenField, validators, Form
+from wtforms import SubmitField, StringField, FloatField, HiddenField, validators, Form
 from flask_wtf import FlaskForm
 from flask import request, render_template, redirect
 from main import db, app, ma
@@ -11,13 +11,13 @@ from status import st, Status
 ################################################################################
 class Settings(db.Model):
     id = db.Column(db.Integer, db.Sequence('settings_id_seq'), primary_key=True )
-    name = db.Column(db.String, unique=True, nullable=True )
-    value = db.Column(db.String, unique=True, nullable=True )
+    import_path = db.Column(db.String)
+    last_import_date = db.Column(db.Float)
 
     def __repr__(self):
-        return "<id: {}, name: {}, value: {}>".format(self.id, self.name, self.value)
+        return "<id: {}, import_path: {}, last_import_date: {}>".format(self.id, self.import_path, self.last_import_date)
 
-###############################################################################
+################################################################################
 # Helper class that inherits a .dump() method to turn class Author into json / useful in jinja2
 ################################################################################
 class SettingsSchema(ma.SQLAlchemyAutoSchema):
@@ -25,7 +25,7 @@ class SettingsSchema(ma.SQLAlchemyAutoSchema):
         model = Settings
         ordered = True
 
-settings_schema=SettingsSchema()
+settings_schema = SettingsSchema(many=True)
 
 ################################################################################
 # Helper class that defines a form for Settings, used to make html <form>
@@ -33,41 +33,37 @@ settings_schema=SettingsSchema()
 ################################################################################
 class SettingsForm(FlaskForm):
     id = HiddenField()
-    name = StringField('Name:', [validators.DataRequired()])
-    value = StringField('value:', [validators.DataRequired()])
+    import_path = StringField('Path to import from:', [validators.DataRequired()])
+    last_import_date = FloatField('Date of last import:', [validators.DataRequired()])
     submit = SubmitField('Save' )
 
 ################################################################################
 # /settings -> show current settings
 ################################################################################
-@app.route("/settings", methods=["GET"])
+@app.route("/settings", methods=["GET", "POST"])
 def settings():
-    sets = Settings.query.all()
-    form = SettingsForm()
-    page_title='Show Settings'
-    return render_template("settings.html", objects=sets, form=form, page_title = page_title, alert=st.GetAlert(), message=st.GetMessage() )
-
-################################################################################
-# /setting/<id> -> show current settings
-################################################################################
-@app.route("/setting/<id>", methods=["GET", "POST"])
-def setting(id):
     form = SettingsForm(request.form)
     if request.method == 'POST' and form.validate():
         try:
+			# HACK, I don't really need an id here, but sqlalchemy get weird
+			# without one, so just grab the id of the only row there, it will
+			# do...
+            id = Settings.query.all()[0].id
             s = Settings.query.get(id)
             if 'submit' in request.form:
-                st.SetMessage("Successfully Updated Setting (name={})".format(s.name) )
-                s.name = request.form['name']
-                s.value = request.form['value']
+                st.SetMessage("Successfully Updated Settings" )
+                s.import_path = request.form['import_path']
+                s.last_import_date = request.form['last_import_date']
             db.session.commit()
             return redirect( '/settings' )
         except SQLAlchemyError as e:
             st.SetAlert( "danger" )
             st.SetMessage( "<b>Failed to modify Setting:</b>&nbsp;{}".format(e.orig) )
-            return render_template("edit_setting.html", form=form, page_title=page_title, alert=st.GetAlert(), message=st.GetMessage() )
+            page_title='Show Settings'
+            return render_template("settings.html", form=form, page_title=page_title, alert=st.GetAlert(), message=st.GetMessage() )
     else:
-        s = Settings.query.get(id)
-        page_title='Edit Setting: {}'.format(s.name)
-        form = SettingsForm(request.values, obj=s)
-        return render_template("setting.html", objects=s, form=form, page_title = page_title, alert=st.GetAlert(), message=st.GetMessage() )
+        tmp_sets = Settings.query.all() 
+        sets = settings_schema.dump( tmp_sets )
+        form = SettingsForm(obj=tmp_sets[0])
+        page_title='Show Settings'
+        return render_template("settings.html", form=form, page_title = page_title, alert=st.GetAlert(), message=st.GetMessage() )