Moved all decorators in decorators.py.

2 files changed, 19 insertions, 19 deletions

diff --git a/pyaggr3g470r/decorators.py b/pyaggr3g470r/decorators.py
index f6796224..503b7cf7 100644
--- a/pyaggr3g470r/decorators.py
+++ b/pyaggr3g470r/decorators.py
@@ -2,9 +2,25 @@
 #-*- coding: utf-8 -*-
 
 from threading import Thread
+from functools import wraps
 
 def async(f):
     def wrapper(*args, **kwargs):
         thr = Thread(target = f, args = args, kwargs = kwargs)
         thr.start()
-    return wrapper    
+    return wrapper
+
+def feed_access_required(func):
+    """
+    This decorator enables to check if a user has access to a feed.
+    The administrator of the platform is able to access to the feeds of a normal user.
+    """
+    @wraps(func)
+    def decorated(*args, **kwargs):
+        if kwargs.get('feed_id', None) != None:
+            feed = Feed.query.filter(Feed.id == kwargs.get('feed_id', None)).first()
+            if (feed == None or feed.subscriber.id != g.user.id) and not g.user.is_admin():
+                flash("This feed do not exist.", "danger")
+                return redirect(url_for('home'))
+        return func(*args, **kwargs)
+    return decorated
diff --git a/pyaggr3g470r/views.py b/pyaggr3g470r/views.py
index a2012b06..72fd4e97 100644
--- a/pyaggr3g470r/views.py
+++ b/pyaggr3g470r/views.py
@@ -44,6 +44,7 @@ if not conf.ON_HEROKU:
 from forms import SigninForm, AddFeedForm, ProfileForm
 from pyaggr3g470r import app, db, allowed_file
 from pyaggr3g470r.models import User, Feed, Article, Role
+from pyaggr3g470r.decorators import feed_access_required
 
 Principal(app)
 # Create a permission with a single Need, in this case a RoleNeed.
@@ -74,7 +75,7 @@ def on_identity_loaded(sender, identity):
 def before_request():
     g.user = current_user
     if g.user.is_authenticated():
-        g.user.last_seen = datetime.utcnow()
+        g.user.last_seen = datetime.datetime.utcnow()
         db.session.add(g.user)
         db.session.commit()
 
@@ -112,23 +113,6 @@ def redirect_url(default='home'):
             url_for(default)
 
 
-from functools import wraps
-def feed_access_required(func):
-    """
-    This decorator enables to check if a user has access to a feed.
-    The administrator of the platform is able to access to the feeds of a normal user.
-    """
-    @wraps(func)
-    def decorated(*args, **kwargs):
-        if kwargs.get('feed_id', None) != None:
-            feed = Feed.query.filter(Feed.id == kwargs.get('feed_id', None)).first()
-            if (feed == None or feed.subscriber.id != g.user.id) and not g.user.is_admin():
-                flash("This feed do not exist.", "danger")
-                return redirect(url_for('home'))
-        return func(*args, **kwargs)
-    return decorated
-
-
 
 #
 # Views.