correcting wait counter and reactivating last_retrieved

4 files changed, 4 insertions, 11 deletions

diff --git a/pyaggr3g470r/models/article.py b/pyaggr3g470r/models/article.py
index 0466bc35..f8f9d2d8 100644
--- a/pyaggr3g470r/models/article.py
+++ b/pyaggr3g470r/models/article.py
@@ -27,12 +27,10 @@ __copyright__ = "Copyright (c) Cedric Bonhomme"
 __license__ = "GPLv3"
 
 import json
+from bootstrap import db
 from datetime import datetime
-from flask import g
 from sqlalchemy import asc, desc
 
-db = g.db
-
 
 class Article(db.Model):
     """
diff --git a/pyaggr3g470r/models/feed.py b/pyaggr3g470r/models/feed.py
index 24542c28..a37744d6 100644
--- a/pyaggr3g470r/models/feed.py
+++ b/pyaggr3g470r/models/feed.py
@@ -26,12 +26,10 @@ __revision__ = "$Date: 2014/04/12 $"
 __copyright__ = "Copyright (c) Cedric Bonhomme"
 __license__ = "GPLv3"
 
+from bootstrap import db
 from datetime import datetime
-from flask import g
 from sqlalchemy import desc
 
-db = g.db
-
 
 class Feed(db.Model):
     """
diff --git a/pyaggr3g470r/models/role.py b/pyaggr3g470r/models/role.py
index 71497caf..f5a18fdc 100644
--- a/pyaggr3g470r/models/role.py
+++ b/pyaggr3g470r/models/role.py
@@ -26,9 +26,7 @@ __revision__ = "$Date: 2014/04/12 $"
 __copyright__ = "Copyright (c) Cedric Bonhomme"
 __license__ = "GPLv3"
 
-from flask import g
-
-db = g.db
+from bootstrap import db
 
 
 class Role(db.Model):
diff --git a/pyaggr3g470r/models/user.py b/pyaggr3g470r/models/user.py
index f2a268db..0bf9fe04 100644
--- a/pyaggr3g470r/models/user.py
+++ b/pyaggr3g470r/models/user.py
@@ -30,11 +30,10 @@ import re
 import random
 import hashlib
 from datetime import datetime
-from flask import g
 from werkzeug import generate_password_hash, check_password_hash
 from flask.ext.login import UserMixin
 
-db = g.db
+from bootstrap import db
 
 
 class User(db.Model, UserMixin):