archive/blender-bfct
Archived
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Attempt at fixing cross db FK issue

Browse Source
This commit is contained in:
Francesco Siddi
2014-06-23 15:08:04 +02:00
parent d57ef1c185
commit 67dc0e188b
2 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
blender-bfct/application/controllers/admin.py
View File

@@ -51,11 +51,11 @@ class ApplicationView(CustomModelView):
column_labels = {'user.first_name' : 'First Name', 'user.last_name' : 'Last Name'} column_labels = {'user.first_name' : 'First Name', 'user.last_name' : 'Last Name'}
column_searchable_list = ('website', 'status') column_searchable_list = ('website', 'status')
can_create = False can_create = False
form_ajax_refs = { # form_ajax_refs = {
'user': { # 'user': {
'fields': (User.email, User.first_name, User.id) # 'fields': (User.email, User.first_name, User.id)
} # }
} # }
# Create admin # Create admin

18
blender-bfct/application/models/applications.py
View File

@@ -10,8 +10,9 @@ from sqlalchemy.ext.associationproxy import association_proxy
class Application(db.Model): class Application(db.Model):
__table_args__ = {'schema': 'blender-bfct'} __table_args__ = {'schema': 'blender-bfct'}
id = db.Column(db.Integer(), primary_key=True) id = db.Column(db.Integer(), primary_key=True)
blender_id = db.Column(db.Integer(), db.ForeignKey(User.id), nullable=False) #blender_id = db.Column(db.Integer(), db.ForeignKey(User.id), nullable=False)
user = db.relationship('User') #user = db.relationship('User')
blender_id = db.Column(db.Integer(), nullable=False)
network_profile = db.Column(db.String(255)) network_profile = db.Column(db.String(255))
website = db.Column(db.String(255)) website = db.Column(db.String(255))
city_country = db.Column(db.String(255)) city_country = db.Column(db.String(255))
@@ -40,6 +41,10 @@ class Application(db.Model):
else: else:
return '--' return '--'
@property
def user(self):
return User.query.get_or_404(self.blender_id)
class Skill(db.Model): class Skill(db.Model):
@@ -61,6 +66,11 @@ class ReviewersApplications(db.Model):
id = db.Column(db.Integer(), primary_key=True) id = db.Column(db.Integer(), primary_key=True)
application_id = db.Column(db.Integer(), db.ForeignKey(Application.id), nullable=False) application_id = db.Column(db.Integer(), db.ForeignKey(Application.id), nullable=False)
application = db.relationship('Application') application = db.relationship('Application')
reviewer_blender_id = db.Column(db.Integer(), db.ForeignKey(User.id), nullable=False) #reviewer_blender_id = db.Column(db.Integer(), db.ForeignKey(User.id), nullable=False)
reviewer = db.relationship('User') #reviewer = db.relationship('User')
reviewer_blender_id = db.Column(db.Integer(), nullable=False)
approved = db.Column(db.Boolean(), nullable=False) approved = db.Column(db.Boolean(), nullable=False)
@property
def reviewer(self):
return User.query.get_or_404(self.reviewer_blender_id)