diff --git a/pagure/hooks/fedmsg.py b/pagure/hooks/fedmsg.py index e7ed0bb..d671bcf 100644 --- a/pagure/hooks/fedmsg.py +++ b/pagure/hooks/fedmsg.py @@ -42,7 +42,7 @@ class FedmsgTable(BASE): 'Project', remote_side=[Project.id], backref=backref( 'fedmsg_hook', cascade="delete, delete-orphan", - single_parent=True) + single_parent=True, uselist=False) ) diff --git a/pagure/hooks/irc.py b/pagure/hooks/irc.py index f1d26a0..28ca148 100644 --- a/pagure/hooks/irc.py +++ b/pagure/hooks/irc.py @@ -52,7 +52,7 @@ class IrcTable(BASE): 'Project', remote_side=[Project.id], backref=backref( 'irc_hook', cascade="delete, delete-orphan", - single_parent=True) + single_parent=True, uselist=False) ) diff --git a/pagure/hooks/mail.py b/pagure/hooks/mail.py index f6e70c4..a1c3792 100644 --- a/pagure/hooks/mail.py +++ b/pagure/hooks/mail.py @@ -44,7 +44,7 @@ class MailTable(BASE): 'Project', remote_side=[Project.id], backref=backref( 'mail_hook', cascade="delete, delete-orphan", - single_parent=True) + single_parent=True, uselist=False) ) diff --git a/pagure/hooks/pagure_ci.py b/pagure/hooks/pagure_ci.py index fa33272..7a671a3 100644 --- a/pagure/hooks/pagure_ci.py +++ b/pagure/hooks/pagure_ci.py @@ -53,26 +53,26 @@ class PagureCITable(BASE): 'Project', remote_side=[Project.id], backref=backref( 'ci_hook', cascade="delete, delete-orphan", - single_parent=True) + single_parent=True, uselist=False) ) tmpl = """ {% if repo | hasattr('ci_hook') and repo.ci_hook and - repo.ci_hook[0].pagure_ci_token %} + repo.ci_hook.pagure_ci_token %} The token to be used by jenkins to trigger the build is:
-{{ repo.ci_hook[0].pagure_ci_token}}
+{{ repo.ci_hook.pagure_ci_token}}
 
The URL to be used to POST the results of your build is:
 {{ (config['APP_URL'][:-1] if config['APP_URL'].endswith('/')
   else config['APP_URL'])
-  + url_for('api_ns.%s_ci_notification' % repo.ci_hook[0].ci_type,
+  + url_for('api_ns.%s_ci_notification' % repo.ci_hook.ci_type,
     repo=repo.name, username=username,
-    pagure_ci_token=repo.ci_hook[0].pagure_ci_token) }}
+    pagure_ci_token=repo.ci_hook.pagure_ci_token) }}
 
{% else %} diff --git a/pagure/hooks/pagure_force_commit.py b/pagure/hooks/pagure_force_commit.py index 2ef2d3b..e0ab0d0 100644 --- a/pagure/hooks/pagure_force_commit.py +++ b/pagure/hooks/pagure_force_commit.py @@ -45,7 +45,7 @@ class PagureForceCommitTable(BASE): 'Project', foreign_keys=[project_id], remote_side=[Project.id], backref=backref( 'pagure_force_commit_hook', cascade="delete, delete-orphan", - single_parent=True) + single_parent=True, uselist=False) ) diff --git a/pagure/hooks/pagure_hook.py b/pagure/hooks/pagure_hook.py index 541cae5..a207f66 100644 --- a/pagure/hooks/pagure_hook.py +++ b/pagure/hooks/pagure_hook.py @@ -44,7 +44,7 @@ class PagureTable(BASE): 'Project', remote_side=[Project.id], backref=backref( 'pagure_hook', cascade="delete, delete-orphan", - single_parent=True) + single_parent=True, uselist=False) ) diff --git a/pagure/hooks/pagure_request_hook.py b/pagure/hooks/pagure_request_hook.py index ee0529c..32f6123 100644 --- a/pagure/hooks/pagure_request_hook.py +++ b/pagure/hooks/pagure_request_hook.py @@ -46,7 +46,7 @@ class PagureRequestsTable(BASE): 'Project', remote_side=[Project.id], backref=backref( 'pagure_hook_requests', cascade="delete, delete-orphan", - single_parent=True) + single_parent=True, uselist=False) ) diff --git a/pagure/hooks/pagure_ticket_hook.py b/pagure/hooks/pagure_ticket_hook.py index d2379c1..06e6c33 100644 --- a/pagure/hooks/pagure_ticket_hook.py +++ b/pagure/hooks/pagure_ticket_hook.py @@ -45,7 +45,7 @@ class PagureTicketsTable(BASE): 'Project', remote_side=[Project.id], backref=backref( 'pagure_hook_tickets', cascade="delete, delete-orphan", - single_parent=True) + single_parent=True, uselist=False) ) diff --git a/pagure/hooks/pagure_unsigned_commits.py b/pagure/hooks/pagure_unsigned_commits.py index 117139f..39117bd 100644 --- a/pagure/hooks/pagure_unsigned_commits.py +++ b/pagure/hooks/pagure_unsigned_commits.py @@ -42,7 +42,7 @@ class PagureUnsignedCommitTable(BASE): 'Project', foreign_keys=[project_id], remote_side=[Project.id], backref=backref( 'pagure_unsigned_commit_hook', cascade="delete, delete-orphan", - single_parent=True) + single_parent=True, uselist=False) ) diff --git a/pagure/hooks/rtd.py b/pagure/hooks/rtd.py index 5f072b2..66ee001 100644 --- a/pagure/hooks/rtd.py +++ b/pagure/hooks/rtd.py @@ -45,7 +45,7 @@ class RtdTable(BASE): 'Project', remote_side=[Project.id], backref=backref( 'rtd_hook', cascade="delete, delete-orphan", - single_parent=True) + single_parent=True, uselist=False) )