From 897b3b765cd588bd41ae3672327414990c82d298 Mon Sep 17 00:00:00 2001 From: farhaanbukhsh Date: Jun 06 2016 10:02:00 +0000 Subject: Add alembic migration and clean code --- diff --git a/alembic/versions/4255158a6913_create_private_column_in_project_table.py b/alembic/versions/4255158a6913_create_private_column_in_project_table.py new file mode 100644 index 0000000..2e8211e --- /dev/null +++ b/alembic/versions/4255158a6913_create_private_column_in_project_table.py @@ -0,0 +1,30 @@ +"""Create private column in project table + +Revision ID: 4255158a6913 +Revises: 317a285e04a8 +Create Date: 2016-06-06 14:33:47.039207 + +""" + +# revision identifiers, used by Alembic. +revision = '4255158a6913' +down_revision = '317a285e04a8' + +from alembic import op +import sqlalchemy as sa + + +def upgrade(): + ''' Add a pivate column in the project table + ''' + op.add_column( + 'projects', + sa.Column('private', sa.Boolean, nullable=False, default=False) + ) + + + +def downgrade(): + ''' Remove the private column + ''' + op.drop_column('projects', 'private') diff --git a/pagure/forms.py b/pagure/forms.py index 7f47f85..d004485 100644 --- a/pagure/forms.py +++ b/pagure/forms.py @@ -44,8 +44,6 @@ class ProjectFormSimplified(wtf.Form): ) - - class ProjectForm(ProjectFormSimplified): ''' Form to create or edit project. ''' name = wtforms.TextField( @@ -401,6 +399,7 @@ class DefaultBranchForm(wtf.Form): (branch, branch) for branch in kwargs['branches'] ] + class EditCommentForm(wtf.Form): """ Form to verify that comment is not empty """ diff --git a/pagure/lib/__init__.py b/pagure/lib/__init__.py index 8d532eb..e0ed00b 100644 --- a/pagure/lib/__init__.py +++ b/pagure/lib/__init__.py @@ -962,8 +962,8 @@ def add_pull_request_flag(session, request, username, percent, comment, url, def new_project(session, user, name, blacklist, allowed_prefix, gitfolder, docfolder, ticketfolder, requestfolder, - description=None, url=None, avatar_email=None, private=False, - parent_id=None, add_readme=False, userobj=None): + description=None, url=None, avatar_email=None, parent_id=None, + add_readme=False, userobj=None, private=False): ''' Create a new project based on the information provided. ''' if name in blacklist: @@ -1410,7 +1410,7 @@ def fork_project(session, user, repo, gitfolder, def search_projects( session, username=None, fork=None, tags=None, pattern=None, - private=None, start=None, limit=None, count=False, sort=None): + start=None, limit=None, count=False, sort=None, private=None): '''List existing projects ''' projects = session.query( diff --git a/pagure/ui/app.py b/pagure/ui/app.py index 8721943..f2b01c4 100644 --- a/pagure/ui/app.py +++ b/pagure/ui/app.py @@ -106,22 +106,26 @@ def index_auth(): repos = pagure.lib.search_projects( SESSION, username=flask.g.fas_user.username, - fork=False, private=private) + fork=False, + private=private) repos_length = pagure.lib.search_projects( SESSION, username=flask.g.fas_user.username, fork=False, - count=True, private=private) + count=True, + private=private) forks = pagure.lib.search_projects( SESSION, username=flask.g.fas_user.username, - fork=True, private=private) + fork=True, + private=private) forks_length = pagure.lib.search_projects( SESSION, username=flask.g.fas_user.username, fork=True, - count=True, private=private) + count=True, + private=private) return flask.render_template( 'index_auth.html', @@ -199,13 +203,15 @@ def view_users(username=None): SESSION, username=user.user, fork=False, - count=True, private=private) + count=True, + private=private) forks_length = pagure.lib.search_projects( SESSION, username=user.user, fork=True, - count=True, private=private) + count=True, + private=private) user.repos_length = repos_length user.forks_length = forks_length @@ -252,7 +258,12 @@ def view_projects(pattern=None): start = limit * (page - 1) projects = pagure.lib.search_projects( - SESSION, pattern=pattern, fork=forks, start=start, limit=limit, private=private) + SESSION, + pattern=pattern, + fork=forks, + start=start, + limit=limit, + private=private) if len(projects) == 1: flask.flash('Only one result found, redirecting you to it')