diff --git a/blender-bfct/application/models/applications.py b/blender-bfct/application/models/applications.py index c9fe40c..d5a124a 100644 --- a/blender-bfct/application/models/applications.py +++ b/blender-bfct/application/models/applications.py @@ -5,6 +5,7 @@ from application.helpers import pretty_date from users import User from sqlalchemy.ext.associationproxy import association_proxy +from flask.ext.security import current_user class Application(db.Model): @@ -41,6 +42,15 @@ class Application(db.Model): else: return '--' + def is_reviewed(self): + for review in ReviewersApplications.query.\ + filter_by(application_id=self.id).\ + all(): + if review.reviewer_blender_id == current_user.id: + return True + else: + return False + @property def user(self): return User.query.get_or_404(self.blender_id) @@ -65,7 +75,7 @@ skills_applications = db.Table('skills_applications', class ReviewersApplications(db.Model): id = db.Column(db.Integer(), primary_key=True) application_id = db.Column(db.Integer(), db.ForeignKey(Application.id), nullable=False) - application = db.relationship('Application') + application = db.relationship('Application', backref='reviewers') #reviewer_blender_id = db.Column(db.Integer(), db.ForeignKey(User.id), nullable=False) #reviewer = db.relationship('User') reviewer_blender_id = db.Column(db.Integer(), nullable=False) diff --git a/blender-bfct/application/templates/applications/index.html b/blender-bfct/application/templates/applications/index.html index 36ee7c1..fede6eb 100755 --- a/blender-bfct/application/templates/applications/index.html +++ b/blender-bfct/application/templates/applications/index.html @@ -17,7 +17,7 @@
{% for application in applications %} -