From f1d1e882ca2c737c6f987bab35426767eda2b6c2 Mon Sep 17 00:00:00 2001 From: farhaanbukhsh Date: Aug 11 2016 08:44:15 +0000 Subject: Fix variable change and default private --- diff --git a/pagure/lib/__init__.py b/pagure/lib/__init__.py index 5eba507..fc1ef59 100644 --- a/pagure/lib/__init__.py +++ b/pagure/lib/__init__.py @@ -1469,7 +1469,7 @@ def fork_project(session, user, repo, gitfolder, def search_projects( session, username=None, fork=None, tags=None, pattern=None, - start=None, limit=None, count=False, sort=None, private=None): + start=None, limit=None, count=False, sort=None, private=False): '''List existing projects ''' projects = session.query( diff --git a/pagure/ui/app.py b/pagure/ui/app.py index 40bfac5..e1474cd 100644 --- a/pagure/ui/app.py +++ b/pagure/ui/app.py @@ -45,14 +45,11 @@ def index(): limit = APP.config['ITEM_PER_PAGE'] start = limit * (page - 1) - private = False - repos = pagure.lib.search_projects( SESSION, fork=False, start=start, limit=limit, - private=private, sort=sorting) num_repos = pagure.lib.search_projects( @@ -109,7 +106,8 @@ def index_auth(): SESSION, username=flask.g.fas_user.username, fork=False, - count=True) + count=True, + private=flask.g.fas_user.usernam) forks = pagure.lib.search_projects( SESSION, @@ -121,7 +119,8 @@ def index_auth(): SESSION, username=flask.g.fas_user.username, fork=True, - count=True) + count=True, + private=flask.g.fas_user.username) return flask.render_template( 'index_auth.html', diff --git a/pagure/ui/repo.py b/pagure/ui/repo.py index 886d817..545ba76 100644 --- a/pagure/ui/repo.py +++ b/pagure/ui/repo.py @@ -63,7 +63,7 @@ def view_repo(repo, username=None): """ repo = pagure.lib.get_project(SESSION, repo, user=username) - if repo is None: + if not repo: flask.abort(404, 'Project not found') if repo.private and not is_repo_admin(repo): @@ -168,7 +168,7 @@ def view_repo_branch(repo, branchname, username=None): ''' Returns the list of branches in the repo. ''' repo = pagure.lib.get_project(SESSION, repo, user=username) - if repo is None: + if not repo: flask.abort(404, 'Project not found') if repo.private and not is_repo_admin(repo): @@ -276,7 +276,7 @@ def view_commits(repo, branchname=None, username=None): repo = pagure.lib.get_project(SESSION, repo, user=username) - if repo is None: + if not repo: flask.abort(404, 'Project not found') if repo.private and not is_repo_admin(repo): @@ -461,7 +461,7 @@ def view_file(repo, identifier, filename, username=None): repo = pagure.lib.get_project(SESSION, repo, user=username) - if repo is None: + if not repo: flask.abort(404, 'Project not found') if repo.private and not is_repo_admin(repo): @@ -597,7 +597,7 @@ def view_raw_file(repo, identifier, filename=None, username=None): """ repo = pagure.lib.get_project(SESSION, repo, user=username) - if repo is None: + if not repo: flask.abort(404, 'Project not found') if repo.private and not is_repo_admin(repo): @@ -710,7 +710,7 @@ def view_commit(repo, commitid, username=None): """ repo = pagure.lib.get_project(SESSION, repo, user=username) - if repo is None: + if not repo: flask.abort(404, 'Project not found') if repo.private and not is_repo_admin(repo): @@ -763,7 +763,7 @@ def view_commit_patch(repo, commitid, username=None): """ repo = pagure.lib.get_project(SESSION, repo, user=username) - if repo is None: + if not repo: flask.abort(404, 'Project not found') if repo.private and not is_repo_admin(repo): @@ -797,7 +797,7 @@ def view_tree(repo, identifier=None, username=None): """ repo = pagure.lib.get_project(SESSION, repo, user=username) - if repo is None: + if not repo: flask.abort(404, 'Project not found') if repo.private and not is_repo_admin(repo): @@ -875,7 +875,7 @@ def view_forks(repo, username=None): """ repo = pagure.lib.get_project(SESSION, repo, user=username) - if repo is None: + if not repo: flask.abort(404, 'Project not found') if repo.private and not is_repo_admin(repo): @@ -899,7 +899,7 @@ def view_tags(repo, username=None): """ repo = pagure.lib.get_project(SESSION, repo, user=username) - if repo is None: + if not repo: flask.abort(404, 'Project not found') if repo.private and not is_repo_admin(repo): @@ -935,7 +935,7 @@ def new_release(repo, username=None): repo = pagure.lib.get_project(SESSION, repo, user=username) - if repo is None: + if not repo: flask.abort(404, 'Project not found') if repo.private and not is_repo_admin(repo): @@ -990,7 +990,7 @@ def view_settings(repo, username=None): repo = pagure.lib.get_project(SESSION, repo, user=username) - if repo is None: + if not repo: flask.abort(404, 'Project not found') if repo.private and not is_repo_admin(repo): @@ -1078,7 +1078,7 @@ def update_project(repo, username=None): repo = pagure.lib.get_project(SESSION, repo, user=username) - if repo is None: + if not repo: flask.abort(404, 'Project not found') if repo.private and not is_repo_admin(repo): @@ -1129,7 +1129,7 @@ def update_priorities(repo, username=None): repo = pagure.lib.get_project(SESSION, repo, user=username) - if repo is None: + if not repo: flask.abort(404, 'Project not found') if repo.private and not is_repo_admin(repo): @@ -1223,14 +1223,12 @@ def update_milestones(repo, username=None): repo = pagure.lib.get_project(SESSION, repo, user=username) - if repo is None: + if not repo: flask.abort(404, 'Project not found') if repo.private and not is_repo_admin(repo): flask.abort(401, 'Forbidden') - if not repo: - flask.abort(404, 'Project not found') if not repo.settings.get('issue_tracker', True): flask.abort(404, 'No issue tracker found for this project') @@ -1313,7 +1311,7 @@ def change_ref_head(repo, username=None): repo = pagure.lib.get_project(SESSION, repo, user=username) - if repo is None: + if not repo: flask.abort(404, 'Project not found') if repo.private and not is_repo_admin(repo): @@ -1359,7 +1357,7 @@ def delete_repo(repo, username=None): repo = pagure.lib.get_project(SESSION, repo, user=username) - if repo is None: + if not repo: flask.abort(404, 'Project not found') if repo.private and not is_repo_admin(repo): @@ -1420,7 +1418,7 @@ def new_repo_hook_token(repo, username=None): repo = pagure.lib.get_project(SESSION, repo, user=username) - if repo is None: + if not repo: flask.abort(404, 'Project not found') if repo.private and not is_repo_admin(repo): @@ -1468,7 +1466,7 @@ def remove_user(repo, userid, username=None): repo = pagure.lib.get_project(SESSION, repo, user=username) - if repo is None: + if not repo: flask.abort(404, 'Project not found') if repo.private and not is_repo_admin(repo): @@ -1529,7 +1527,7 @@ def add_user(repo, username=None): repo = pagure.lib.get_project(SESSION, repo, user=username) - if repo is None: + if not repo: flask.abort(404, 'Project not found') if repo.private and not is_repo_admin(repo): @@ -1591,7 +1589,7 @@ def remove_group_project(repo, groupid, username=None): repo = pagure.lib.get_project(SESSION, repo, user=username) - if repo is None: + if not repo: flask.abort(404, 'Project not found') if repo.private and not is_repo_admin(repo): @@ -1652,7 +1650,7 @@ def add_group_project(repo, username=None): repo = pagure.lib.get_project(SESSION, repo, user=username) - if repo is None: + if not repo: flask.abort(404, 'Project not found') if repo.private and not is_repo_admin(repo): @@ -1712,7 +1710,7 @@ def regenerate_git(repo, username=None): repo = pagure.lib.get_project(SESSION, repo, user=username) - if repo is None: + if not repo: flask.abort(404, 'Project not found') if repo.private and not is_repo_admin(repo): @@ -1764,7 +1762,7 @@ def add_token(repo, username=None): repo = pagure.lib.get_project(SESSION, repo, user=username) - if repo is None: + if not repo: flask.abort(404, 'Project not found') if repo.private and not is_repo_admin(repo): @@ -1825,7 +1823,7 @@ def revoke_api_token(repo, token_id, username=None): repo = pagure.lib.get_project(SESSION, repo, user=username) - if repo is None: + if not repo: flask.abort(404, 'Project not found') if repo.private and not is_repo_admin(repo): @@ -1876,7 +1874,7 @@ def edit_file(repo, branchname, filename, username=None): repo = pagure.lib.get_project(SESSION, repo, user=username) - if repo is None: + if not repo: flask.abort(404, 'Project not found') if repo.private and not is_repo_admin(repo): @@ -1965,12 +1963,12 @@ def edit_file(repo, branchname, filename, username=None): def delete_branch(repo, branchname, username=None): """ Delete the branch of a project. """ - repo = pagure.lib.get_project(SESSION, repo, user=username) + repo_obj = pagure.lib.get_project(SESSION, repo, user=username) - if repo is None: + if not repo_obj: flask.abort(404, 'Project not found') - if repo.private and not is_repo_admin(repo): + if repo.private and not is_repo_admin(repo_obj): flask.abort(401, 'Forbidden') if not is_repo_admin(repo_obj): @@ -2006,12 +2004,12 @@ def delete_branch(repo, branchname, username=None): def view_docs(repo, username=None, filename=None): """ Display the documentation """ - repo = pagure.lib.get_project(SESSION, repo, user=username) + repo_obj = pagure.lib.get_project(SESSION, repo, user=username) - if repo is None: + if not repo_obj: flask.abort(404, 'Project not found') - if repo.private and not is_repo_admin(repo): + if repo.private and not is_repo_admin(repo_obj): flask.abort(401, 'Forbidden') if not APP.config.get('DOC_APP_URL'): @@ -2038,7 +2036,7 @@ def view_project_activity(repo): repo = pagure.lib.get_project(SESSION, repo, user=username) - if repo is None: + if not repo: flask.abort(404, 'Project not found') if repo.private and not is_repo_admin(repo):