Attempt at fixing cross db FK issue
This commit is contained in:
@@ -51,11 +51,11 @@ class ApplicationView(CustomModelView):
|
||||
column_labels = {'user.first_name' : 'First Name', 'user.last_name' : 'Last Name'}
|
||||
column_searchable_list = ('website', 'status')
|
||||
can_create = False
|
||||
form_ajax_refs = {
|
||||
'user': {
|
||||
'fields': (User.email, User.first_name, User.id)
|
||||
}
|
||||
}
|
||||
# form_ajax_refs = {
|
||||
# 'user': {
|
||||
# 'fields': (User.email, User.first_name, User.id)
|
||||
# }
|
||||
# }
|
||||
|
||||
|
||||
# Create admin
|
||||
|
@@ -10,8 +10,9 @@ from sqlalchemy.ext.associationproxy import association_proxy
|
||||
class Application(db.Model):
|
||||
__table_args__ = {'schema': 'blender-bfct'}
|
||||
id = db.Column(db.Integer(), primary_key=True)
|
||||
blender_id = db.Column(db.Integer(), db.ForeignKey(User.id), nullable=False)
|
||||
user = db.relationship('User')
|
||||
#blender_id = db.Column(db.Integer(), db.ForeignKey(User.id), nullable=False)
|
||||
#user = db.relationship('User')
|
||||
blender_id = db.Column(db.Integer(), nullable=False)
|
||||
network_profile = db.Column(db.String(255))
|
||||
website = db.Column(db.String(255))
|
||||
city_country = db.Column(db.String(255))
|
||||
@@ -40,6 +41,10 @@ class Application(db.Model):
|
||||
else:
|
||||
return '--'
|
||||
|
||||
@property
|
||||
def user(self):
|
||||
return User.query.get_or_404(self.blender_id)
|
||||
|
||||
|
||||
|
||||
class Skill(db.Model):
|
||||
@@ -61,6 +66,11 @@ 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')
|
||||
reviewer_blender_id = db.Column(db.Integer(), db.ForeignKey(User.id), nullable=False)
|
||||
reviewer = db.relationship('User')
|
||||
#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)
|
||||
approved = db.Column(db.Boolean(), nullable=False)
|
||||
|
||||
@property
|
||||
def reviewer(self):
|
||||
return User.query.get_or_404(self.reviewer_blender_id)
|
||||
|
Reference in New Issue
Block a user