Finish the timezine feature

2 files changed, 5 insertions, 4 deletions

diff --git a/famille.py b/famille.py
index 47e98ea..6bae72f 100644
--- a/famille.py
+++ b/famille.py
@@ -188,10 +188,11 @@ def edit_user():
                      'address_line2', 'address_city_line', 'timezone'])
         args += ("notify" in request.form, session['user_id'])
         sqlstr = "UPDATE users SET email= ?, phone=?, birthday=?, nameday=?," \
-        "address_line1=?, address_line2=?, address_city_line=?, notify=? " \
+        "address_line1=?, address_line2=?, address_city_line=?, timezone=?, notify=? " \
         "where id=?"
         g.db.execute(sqlstr, args)
         g.db.commit()
+        session["timezone"] = request.form["timezone"]
         return redirect(url_for('view_user', user_id=session['user_id']))
 
 @app.route('/login/', methods=['GET', 'POST'])
@@ -208,7 +209,7 @@ def login():
             if user['password'] == password:
                 session['user_name'] = user['user_name']
                 session['user_id'] = user['id']
-                session['timezone'] = user['timezone']
+                session['timezone'] = user['timezone'] or "UTC"
                 g.db.execute("UPDATE users SET last_seen=? WHERE id=?",
                 (datetime.utcnow(),session['user_id']))
                 g.db.commit()
diff --git a/templates/user/edit.html b/templates/user/edit.html
index 9f51c2a..ce2c95f 100644
--- a/templates/user/edit.html
+++ b/templates/user/edit.html
@@ -42,9 +42,9 @@
 <label for="city_line">Ville, CP <span class="info">(dernière ligne)</span> :</label>
 <input type="text" id="city_line" size="30" name="address_city_line" value="{{user.address_city_line}}"/><br />
 <label for="timezone">Timezone:</label>
-<select>
+<select id="timezone" name="timezone">
 {% for timezone in g.timezone %}
-<option {%if timezone==session.timezone %}select {% endif %}>{{timezone}}</option>
+<option {%if timezone==session.timezone %}selected="selected" {% endif %}>{{timezone}}</option>
 {% endfor %}
 </select>
 </p>