From 200ea347cc34be0068bede17827b2cc13af999cd Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Mar 13 2016 10:26:31 +0000 Subject: [PATCH 1/2] Disable the Commits and Files tab when viewing issues, the settings or PRs --- diff --git a/pagure/ui/fork.py b/pagure/ui/fork.py index 3b2c9d0..076fede 100644 --- a/pagure/ui/fork.py +++ b/pagure/ui/fork.py @@ -188,6 +188,7 @@ def request_pulls(repo, username=None): select='requests', repo=repo, username=username, + repo_obj=repo_obj, requests=requests, oth_requests=oth_requests, status=status, @@ -279,6 +280,7 @@ def request_pull(repo, requestid, username=None): requestid=requestid, repo=repo, username=username, + repo_obj=repo_obj, pull_request=request, repo_admin=is_repo_admin(request.project), diff_commits=diff_commits, diff --git a/pagure/ui/issues.py b/pagure/ui/issues.py index 9350ded..45b7b50 100644 --- a/pagure/ui/issues.py +++ b/pagure/ui/issues.py @@ -394,6 +394,9 @@ def view_issues(repo, username=None): tag_list = pagure.lib.get_tags_of_project(SESSION, repo) + reponame = pagure.get_repo_path(repo) + repo_obj = pygit2.Repository(reponame) + return flask.render_template( 'issues.html', select='issues', @@ -407,6 +410,7 @@ def view_issues(repo, username=None): assignee=assignee, author=author, repo_admin=is_repo_admin(repo), + repo_obj=repo_obj, ) @@ -538,6 +542,9 @@ def view_issue(repo, issueid, username=None): flask.abort( 403, 'This issue is private and you are not allowed to view it') + reponame = pagure.get_repo_path(repo) + repo_obj = pygit2.Repository(reponame) + status = pagure.lib.get_issue_statuses(SESSION) form = pagure.forms.UpdateIssueForm(status=status) @@ -548,6 +555,7 @@ def view_issue(repo, issueid, username=None): select='issues', repo=repo, username=username, + repo_obj=repo_obj, tag_list=tag_list, issue=issue, issueid=issueid, diff --git a/pagure/ui/repo.py b/pagure/ui/repo.py index f85769a..c1c14a5 100644 --- a/pagure/ui/repo.py +++ b/pagure/ui/repo.py @@ -727,6 +727,9 @@ def view_tags(repo, username=None): if not repo: flask.abort(404, 'Project not found') + reponame = pagure.get_repo_path(repo) + repo_obj = pygit2.Repository(reponame) + tags = pagure.lib.git.get_git_tags_objects(repo) return flask.render_template( 'releases.html', @@ -735,6 +738,7 @@ def view_tags(repo, username=None): repo=repo, tags=tags, repo_admin=is_repo_admin(repo), + repo_obj=repo_obj, ) @@ -863,6 +867,7 @@ def view_settings(repo, username=None): select='settings', username=username, repo=repo, + repo_obj=repo_obj, form=form, tag_form=tag_form, branches_form=branches_form, From 5361ad87f10e4e725089852684dd2a51c89a6232 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Mar 13 2016 10:26:50 +0000 Subject: [PATCH 2/2] Adjust the unit-tests for requiring a git repo to view tickets --- diff --git a/tests/test_pagure_flask_ui_issues.py b/tests/test_pagure_flask_ui_issues.py index d1d7719..f96c0ff 100644 --- a/tests/test_pagure_flask_ui_issues.py +++ b/tests/test_pagure_flask_ui_issues.py @@ -67,6 +67,8 @@ class PagureFlaskIssuestests(tests.Modeltests): self.assertEqual(output.status_code, 404) tests.create_projects(self.session) + tests.create_projects_git( + os.path.join(tests.HERE), bare=True) output = self.app.get('/test/new_issue') self.assertEqual(output.status_code, 200) @@ -156,6 +158,8 @@ class PagureFlaskIssuestests(tests.Modeltests): tests.create_projects(self.session) tests.create_projects_git( + os.path.join(tests.HERE), bare=True) + tests.create_projects_git( os.path.join(tests.HERE, 'tickets'), bare=True) user = tests.FakeUser() @@ -227,6 +231,8 @@ class PagureFlaskIssuestests(tests.Modeltests): self.assertEqual(output.status_code, 404) tests.create_projects(self.session) + tests.create_projects_git( + os.path.join(tests.HERE), bare=True) output = self.app.get('/test/issues') self.assertEqual(output.status_code, 200) @@ -290,6 +296,8 @@ class PagureFlaskIssuestests(tests.Modeltests): self.assertEqual(output.status_code, 404) tests.create_projects(self.session) + tests.create_projects_git( + os.path.join(tests.HERE), bare=True) output = self.app.get('/test/issue/1') self.assertEqual(output.status_code, 404) @@ -412,6 +420,8 @@ class PagureFlaskIssuestests(tests.Modeltests): self.assertEqual(output.status_code, 302) tests.create_projects(self.session) + tests.create_projects_git( + os.path.join(tests.HERE), bare=True) output = self.app.get('/test/issue/1/update') self.assertEqual(output.status_code, 302) @@ -704,6 +714,8 @@ class PagureFlaskIssuestests(tests.Modeltests): p_ugt.return_value = True tests.create_projects(self.session) + tests.create_projects_git( + os.path.join(tests.HERE), bare=True) # Create issues to play with repo = pagure.lib.get_project(self.session, 'test') @@ -812,6 +824,8 @@ class PagureFlaskIssuestests(tests.Modeltests): p_ugt.return_value = True tests.create_projects(self.session) + tests.create_projects_git( + os.path.join(tests.HERE), bare=True) # Create issues to play with repo = pagure.lib.get_project(self.session, 'test') @@ -905,6 +919,8 @@ class PagureFlaskIssuestests(tests.Modeltests): p_ugt.return_value = True tests.create_projects(self.session) + tests.create_projects_git( + os.path.join(tests.HERE), bare=True) # Create issues to play with repo = pagure.lib.get_project(self.session, 'test') @@ -999,6 +1015,8 @@ class PagureFlaskIssuestests(tests.Modeltests): tests.create_projects(self.session) tests.create_projects_git( + os.path.join(tests.HERE), bare=True) + tests.create_projects_git( os.path.join(tests.HERE, 'tickets'), bare=True) # Create issues to play with @@ -1172,6 +1190,8 @@ class PagureFlaskIssuestests(tests.Modeltests): self.assertEqual(output.status_code, 404) tests.create_projects(self.session) + tests.create_projects_git( + os.path.join(tests.HERE), bare=True) output = self.app.get('/test/issue/1/edit') self.assertEqual(output.status_code, 404) @@ -1521,6 +1541,8 @@ class PagureFlaskIssuestests(tests.Modeltests): p_ugt.return_value = True tests.create_projects(self.session) + tests.create_projects_git( + os.path.join(tests.HERE), bare=True) # Create issues to play with repo = pagure.lib.get_project(self.session, 'test')