From 74c73f8be05368533bfe719304cb167c52bb5408 Mon Sep 17 00:00:00 2001 From: farhaanbukhsh Date: Jun 06 2016 10:01:59 +0000 Subject: Fix more conditions --- diff --git a/pagure/ui/app.py b/pagure/ui/app.py index 1ac309d..c678e9c 100644 --- a/pagure/ui/app.py +++ b/pagure/ui/app.py @@ -45,12 +45,17 @@ def index(): limit = APP.config['ITEM_PER_PAGE'] start = limit * (page - 1) + if authenticated(): + private = flask.g.fas_user.username + else: + private = False + repos = pagure.lib.search_projects( SESSION, fork=False, start=start, limit=limit, - private=False, + private=private, sort=sorting) num_repos = pagure.lib.search_projects( @@ -171,6 +176,11 @@ def view_users(username=None): users = pagure.lib.search_user(SESSION, pattern=username) + if authenticated(): + private = flask.g.fas_user.username + else: + private = False + if len(users) == 1: flask.flash('Only one result found, redirecting you to it') return flask.redirect( @@ -189,7 +199,7 @@ def view_users(username=None): SESSION, username=user.user, fork=False, - count=True) + count=True, private=private) forks_length = pagure.lib.search_projects( SESSION, @@ -233,11 +243,16 @@ def view_projects(pattern=None): else: forks = False + if authenticated(): + private = flask.g.fas_user.username + else: + private = False + limit = APP.config['ITEM_PER_PAGE'] start = limit * (page - 1) projects = pagure.lib.search_projects( - SESSION, pattern=pattern, fork=forks, start=start, limit=limit) + 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') @@ -293,17 +308,24 @@ def view_user(username): repo_start = limit * (repopage - 1) fork_start = limit * (forkpage - 1) + if authenticated(): + private = flask.g.fas_user.username + else: + private = False + repos = pagure.lib.search_projects( SESSION, username=username, fork=False, start=repo_start, - limit=limit) + limit=limit, + private=private) repos_length = pagure.lib.search_projects( SESSION, username=username, fork=False, - count=True) + count=True, + private=private) forks = pagure.lib.search_projects( SESSION, @@ -382,7 +404,7 @@ def new_project(): message = pagure.lib.new_project( SESSION, name=name, - private = private, + private=private, description=description, url=url, avatar_email=avatar_email,