From 590caf306a4ceffdef103f940f31bd6565bc975d Mon Sep 17 00:00:00 2001 From: Silvie Chlupova Date: Aug 19 2019 08:51:49 +0000 Subject: Monitor page should not show builds from PR. Fixes: #839 --- diff --git a/frontend/coprs_frontend/alembic/schema/versions/12abab545d7a_added_index_for_main_in_copr_dir.py b/frontend/coprs_frontend/alembic/schema/versions/12abab545d7a_added_index_for_main_in_copr_dir.py new file mode 100644 index 0000000..3dd12b3 --- /dev/null +++ b/frontend/coprs_frontend/alembic/schema/versions/12abab545d7a_added_index_for_main_in_copr_dir.py @@ -0,0 +1,22 @@ +""" +Added index for main in copr_dir + +Revision ID: 12abab545d7a +Revises: 3cba3ffe2836 +Create Date: 2019-08-19 08:18:02.561158 +""" + +import sqlalchemy as sa +from alembic import op + + +revision = '12abab545d7a' +down_revision = '3cba3ffe2836' + + +def upgrade(): + op.create_index(op.f('ix_copr_dir_main'), 'copr_dir', ['main'], unique=False) + + +def downgrade(): + op.drop_index(op.f('ix_copr_dir_main'), table_name='copr_dir') diff --git a/frontend/coprs_frontend/coprs/logic/builds_logic.py b/frontend/coprs_frontend/coprs/logic/builds_logic.py index 92cc829..da980bb 100644 --- a/frontend/coprs_frontend/coprs/logic/builds_logic.py +++ b/frontend/coprs_frontend/coprs/logic/builds_logic.py @@ -1238,6 +1238,7 @@ class BuildsMonitorLogic(object): AND build_chroot.build_id = max_build_ids_for_a_chroot.max_build_id_for_chroot JOIN mock_chroot ON mock_chroot.id = max_build_ids_for_a_chroot.mock_chroot_id + JOIN copr_dir ON build.copr_dir_id=copr_dir.id WHERE copr_dir.main IS TRUE ORDER BY package.name ASC, package.id ASC, mock_chroot.os_release ASC, mock_chroot.os_version ASC, mock_chroot.arch ASC """.format(copr_id=copr.id) rows = db.session.execute(query) diff --git a/frontend/coprs_frontend/coprs/models.py b/frontend/coprs_frontend/coprs/models.py index 94dedcb..b61510d 100644 --- a/frontend/coprs_frontend/coprs/models.py +++ b/frontend/coprs_frontend/coprs/models.py @@ -561,7 +561,7 @@ class CoprDir(db.Model): id = db.Column(db.Integer, primary_key=True) name = db.Column(db.Text, index=True) - main = db.Column(db.Boolean, default=False, server_default="0", nullable=False) + main = db.Column(db.Boolean, index=True, default=False, server_default="0", nullable=False) ownername = db.Column(db.Text, index=True, nullable=False)