From baa162f01bab748a649d8449dd9afec295781ab2 Mon Sep 17 00:00:00 2001 From: Farhaan Bukhsh Date: Apr 14 2017 10:32:37 +0000 Subject: Fix the changes suggested by @vivekanad1101 --- diff --git a/alembic/versions/4255158a6913_create_private_column_in_project_table.py b/alembic/versions/4255158a6913_create_private_column_in_project_table.py index a65b545..dbeb1f3 100644 --- a/alembic/versions/4255158a6913_create_private_column_in_project_table.py +++ b/alembic/versions/4255158a6913_create_private_column_in_project_table.py @@ -8,7 +8,7 @@ Create Date: 2016-06-06 14:33:47.039207 # revision identifiers, used by Alembic. revision = '4255158a6913' -down_revision = '208b0cd232ab' +down_revision = '38581a8fbae2' from alembic import op import sqlalchemy as sa @@ -19,14 +19,14 @@ def upgrade(): ''' op.add_column( 'projects', - sa.Column('_private', sa.Boolean, nullable=True, default=False) + sa.Column('private', sa.Boolean, nullable=True, default=False) ) op.execute('''UPDATE "projects" ''' - '''SET _private=False;''') + '''SET private=False;''') op.alter_column( 'projects', - column_name='_private', new_column_name='private', + column_name='private', new_column_name='private', nullable=False, existing_nullable=True) diff --git a/ev-server/pagure_stream_server.py b/ev-server/pagure_stream_server.py index 66f62aa..0d74f1d 100644 --- a/ev-server/pagure_stream_server.py +++ b/ev-server/pagure_stream_server.py @@ -144,8 +144,9 @@ def get_obj_from_path(path): """ Return the Ticket or Request object based on the path provided. """ (username, namespace, reponame, objtype, objid) = _parse_path(path) - repo = pagure.get_authorized_project(pagure.SESSION, reponame, - user=username, namespace=namespace) + repo = pagure.get_authorized_project( + pagure.SESSION, reponame, user=username, namespace=namespace) + if repo is None: raise PagureEvException("Project '%s' not found" % reponame) diff --git a/pagure/__init__.py b/pagure/__init__.py index e6fb234..1d86f6a 100644 --- a/pagure/__init__.py +++ b/pagure/__init__.py @@ -502,8 +502,9 @@ def set_variables(): flask.g.repo = pagure.get_authorized_project( SESSION, repo, user=username, namespace=namespace) if authenticated(): - flask.g.repo_forked = pagure.get_authorized_project(SESSION, repo, user=flask.g.fas_user.username, - namespace=namespace) + flask.g.repo_forked = pagure.get_authorized_project( + SESSION, repo, user=flask.g.fas_user.username, + namespace=namespace) if not flask.g.repo \ and APP.config.get('OLD_VIEW_COMMIT_ENABLED', False) \