From 996c289f8c6fb95f732289f0ca420cc0f0e22ed5 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Apr 27 2014 15:06:48 +0000 Subject: Add the relation to the project and define couple of others variables required --- diff --git a/progit/hooks/irc.py b/progit/hooks/irc.py index 96cd8ce..5d2a95e 100644 --- a/progit/hooks/irc.py +++ b/progit/hooks/irc.py @@ -8,12 +8,13 @@ """ -from flask.ext import wtf import sqlalchemy as sa import wtforms +from flask.ext import wtf +from sqlalchemy.orm import relation from progit.hooks import BaseHook -from progit.model import BASE +from progit.model import BASE, Project from progit import SESSION @@ -30,6 +31,7 @@ class IrcTable(BASE): sa.Integer, sa.ForeignKey('projects.id', onupdate='CASCADE'), nullable=False, + unique=True, index=True) server = sa.Column(sa.Text, nullable=False) @@ -41,6 +43,9 @@ class IrcTable(BASE): join = sa.Column(sa.Boolean, nullable=False, default=True) ssl = sa.Column(sa.Boolean, nullable=False, default=True) + project = relation( + 'Project', remote_side=[Project.id], backref='irc_hook') + class IrcForm(wtf.Form): ''' Form to configure the irc hook. ''' @@ -84,6 +89,8 @@ class Hook(BaseHook): name = 'IRC' form = IrcForm + db_object = IrcTable + backref = 'irc_hook' form_fields = [ 'server', 'port', 'room', 'nick', 'nick_pass', 'active', 'join', 'ssl'