From d373386692669a1eaa137d02ea9b3a348f16ebdf Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Jul 11 2016 14:21:14 +0000 Subject: [PATCH 1/7] If a ticket is public notify the users watching the project --- diff --git a/pagure/lib/notify.py b/pagure/lib/notify.py index 0ca8443..885492d 100644 --- a/pagure/lib/notify.py +++ b/pagure/lib/notify.py @@ -122,6 +122,11 @@ def _get_emails_for_issue(issue): if issue.assignee and issue.assignee.default_email: emails.add(issue.assignee.default_email) + # Add the person watching this project, if the issue is public + if issue.isa == 'issue' and not issue.private: + for watcher in issue.project.watchers: + emails.add(watcher.user.default_email) + # Remove the person list in unwatch for unwatcher in issue.project.unwatchers: if unwatcher.user.default_email in emails: From c8160dd863526147ec2d88850674371a7eff4ef9 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Jul 11 2016 14:50:07 +0000 Subject: [PATCH 2/7] Make pagure.lib.is_watching accept directly a reponame and its username --- diff --git a/pagure/lib/__init__.py b/pagure/lib/__init__.py index a02e3a4..c4032ac 100644 --- a/pagure/lib/__init__.py +++ b/pagure/lib/__init__.py @@ -2822,7 +2822,7 @@ def update_watch_status(session, project, user, watch): return msg_success -def is_watching(session, user, project): +def is_watching(session, user, reponame, repouser=None): ''' Check user watching the project. ''' if user is None: @@ -2832,14 +2832,30 @@ def is_watching(session, user, project): if not user_obj: return False - watcher = session.query( + query = session.query( model.Watcher ).filter( - sqlalchemy.and_( - model.Watcher.project_id == project.id, - model.Watcher.user_id == user_obj.id, + model.Watcher.user_id == user_obj.id + ).filter( + model.Watcher.project_id == model.Project.id + ).filter( + model.Project.name == reponame + ) + + if repouser is not None: + query = query.filter( + model.User.user == repouser + ).filter( + model.User.id == model.Project.user_id + ).filter( + model.Project.parent_id != None ) - ).first() + else: + query = query.filter( + model.Project.parent_id == None + ) + + watcher = query.first() if watcher: return watcher.watch From f21cbaa768bd248203a954407301ccc5e461bacf Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Jul 11 2016 14:50:29 +0000 Subject: [PATCH 3/7] Pass to all the templates the is_watching function --- diff --git a/pagure/__init__.py b/pagure/__init__.py index 8888a2e..fe2c2f1 100644 --- a/pagure/__init__.py +++ b/pagure/__init__.py @@ -348,11 +348,19 @@ def inject_variables(): if justlogedout: flask.session['_justloggedout'] = None + def is_watching(reponame, username=None): + watch = False + if authenticated(): + watch = pagure.lib.is_watching( + SESSION, flask.g.fas_user, reponame, repouser=username) + return watch + return dict( version=__version__, admin=user_admin, authenticated=authenticated(), forkbuttonform=forkbuttonform, + is_watching=is_watching, ) From b13b8b6e52faa701c171c54c1be0b12eb244ec28 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Jul 11 2016 14:50:43 +0000 Subject: [PATCH 4/7] Make use of the is_watching function and adjust style The is_watching function allows to know if the current user is watching the specified repo or not. --- diff --git a/pagure/templates/repo_master.html b/pagure/templates/repo_master.html index dd58575..9fd4e5e 100644 --- a/pagure/templates/repo_master.html +++ b/pagure/templates/repo_master.html @@ -31,12 +31,20 @@ {% if authenticated %}
- - +
-
+ Unwatch Watch {{ forkbuttonform.csrf_token }} @@ -47,7 +55,8 @@ {% if branchname %}
-
@@ -257,4 +266,4 @@ $(document).ready(function() { }); }); -{% endblock %} \ No newline at end of file +{% endblock %} From 1fc3644ad3904a6812a03b87aef41bce6c338e07 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Jul 11 2016 14:51:33 +0000 Subject: [PATCH 5/7] Drop all the places where we set the watch variable since we no longer use it --- diff --git a/pagure/ui/repo.py b/pagure/ui/repo.py index c744810..efb6385 100644 --- a/pagure/ui/repo.py +++ b/pagure/ui/repo.py @@ -130,10 +130,6 @@ def view_repo(repo, username=None): break diff_commits.append(commit.oid.hex) - watch = False - if authenticated(): - watch = pagure.lib.is_watching(SESSION, flask.g.fas_user, repo) - return flask.render_template( 'repo_info.html', select='overview', @@ -151,7 +147,6 @@ def view_repo(repo, username=None): diff_commits=diff_commits, repo_admin=is_repo_admin(repo), form=pagure.forms.ConfirmationForm(), - watch=watch, ) @@ -236,10 +231,6 @@ def view_repo_branch(repo, branchname, username=None): 'view_raw_file', username=username, repo=repo.name, identifier=branchname, filename='')) - watch = False - if authenticated(): - watch = pagure.lib.is_watching(SESSION, flask.g.fas_user, repo) - return flask.render_template( 'repo_info.html', select='overview', @@ -256,7 +247,6 @@ def view_repo_branch(repo, branchname, username=None): diff_commits=diff_commits, repo_admin=is_repo_admin(repo), form=pagure.forms.ConfirmationForm(), - watch=watch, ) @@ -353,10 +343,6 @@ def view_commits(repo, branchname=None, username=None): diff_commits.append(commit.oid.hex) diff_commits_full.append(commit) - watch = False - if authenticated(): - watch = pagure.lib.is_watching(SESSION, flask.g.fas_user, repo) - return flask.render_template( 'commits.html', select='commits', @@ -375,7 +361,6 @@ def view_commits(repo, branchname=None, username=None): total_page=total_page, repo_admin=is_repo_admin(repo), form=pagure.forms.ConfirmationForm(), - watch=watch, ) @@ -544,10 +529,6 @@ def view_file(repo, identifier, filename, username=None): if encoding: headers['Content-Encoding'] = encoding - watch = False - if authenticated(): - watch = pagure.lib.is_watching(SESSION, flask.g.fas_user, repo) - return ( flask.render_template( 'file.html', @@ -561,7 +542,6 @@ def view_file(repo, identifier, filename, username=None): content=content, output_type=output_type, repo_admin=is_repo_admin(repo), - watch=watch, ), 200, headers @@ -717,10 +697,6 @@ def view_commit(repo, commitid, username=None): # First commit in the repo diff = commit.tree.diff_to_tree(swap=True) - watch = False - if authenticated(): - watch = pagure.lib.is_watching(SESSION, flask.g.fas_user, repo) - return flask.render_template( 'commit.html', select='commits', @@ -731,7 +707,6 @@ def view_commit(repo, commitid, username=None): commitid=commitid, commit=commit, diff=diff, - watch=watch, form=pagure.forms.ConfirmationForm(), ) @@ -808,10 +783,6 @@ def view_tree(repo, identifier=None, username=None): content = sorted(commit.tree, key=lambda x: x.filemode) output_type = 'tree' - watch = False - if authenticated(): - watch = pagure.lib.is_watching(SESSION, flask.g.fas_user, repo) - return flask.render_template( 'file.html', select='tree', @@ -825,7 +796,6 @@ def view_tree(repo, identifier=None, username=None): content=content, output_type=output_type, repo_admin=is_repo_admin(repo), - watch=watch, ) @@ -841,17 +811,12 @@ def view_forks(repo, username=None): if not repo: flask.abort(404, 'Project not found') - watch = False - if authenticated(): - watch = pagure.lib.is_watching(SESSION, flask.g.fas_user, repo) - return flask.render_template( 'forks.html', select='forks', username=username, repo=repo, repo_admin=is_repo_admin(repo), - watch=watch, ) @@ -872,10 +837,6 @@ def view_tags(repo, username=None): tags = pagure.lib.git.get_git_tags_objects(repo) - watch = False - if authenticated(): - watch = pagure.lib.is_watching(SESSION, flask.g.fas_user, repo) - return flask.render_template( 'releases.html', select='tags', @@ -884,7 +845,6 @@ def view_tags(repo, username=None): tags=tags, repo_admin=is_repo_admin(repo), repo_obj=repo_obj, - watch=watch, ) @@ -929,17 +889,12 @@ def new_release(repo, username=None): return flask.redirect( flask.url_for('view_tags', repo=repo.name, username=username)) - watch = False - if authenticated(): - watch = pagure.lib.is_watching(SESSION, flask.g.fas_user, repo) - return flask.render_template( 'new_release.html', select='tags', username=username, repo=repo, form=form, - watch=watch, ) @@ -1013,10 +968,6 @@ def view_settings(repo, username=None): if flask.request.method == 'GET' and branchname: branches_form.branches.data = branchname - watch = False - if authenticated(): - watch = pagure.lib.is_watching(SESSION, flask.g.fas_user, repo) - return flask.render_template( 'settings.html', select='settings', @@ -1030,7 +981,6 @@ def view_settings(repo, username=None): plugins=plugins, repo_admin=repo_admin, branchname = branchname, - watch=watch, ) @@ -1505,16 +1455,11 @@ def add_user(repo, username=None): APP.logger.exception(err) flask.flash('User could not be added', 'error') - watch = False - if authenticated(): - watch = pagure.lib.is_watching(SESSION, flask.g.fas_user, repo) - return flask.render_template( 'add_user.html', form=form, username=username, repo=repo, - watch=watch, ) @@ -1629,16 +1574,11 @@ def add_group_project(repo, username=None): APP.logger.exception(err) flask.flash('Group could not be added', 'error') - watch = False - if authenticated(): - watch = pagure.lib.is_watching(SESSION, flask.g.fas_user, repo) - return flask.render_template( 'add_group_project.html', form=form, username=username, repo=repo, - watch=watch, ) @@ -1737,10 +1677,6 @@ def add_token(repo, username=None): APP.logger.exception(err) flask.flash('User could not be added', 'error') - watch = False - if authenticated(): - watch = pagure.lib.is_watching(SESSION, flask.g.fas_user, repo) - return flask.render_template( 'add_token.html', select='settings', @@ -1749,7 +1685,6 @@ def add_token(repo, username=None): repo_admin=repo_admin, username=username, repo=repo, - watch=watch, ) @@ -1881,10 +1816,6 @@ def edit_file(repo, branchname, filename, username=None): else: data = form.content.data.decode('utf-8') - watch = False - if authenticated(): - watch = pagure.lib.is_watching(SESSION, flask.g.fas_user, repo) - return flask.render_template( 'edit_file.html', select='tree', @@ -1896,7 +1827,6 @@ def edit_file(repo, branchname, filename, username=None): form=form, user=user, branches=repo_obj.listall_branches(), - watch=watch, ) @@ -1953,10 +1883,6 @@ def view_docs(repo, username=None, filename=None): if not APP.config.get('DOC_APP_URL'): flask.abort(404, 'This pagure instance has no doc server') - watch = False - if authenticated(): - watch = pagure.lib.is_watching(SESSION, flask.g.fas_user, repo) - return flask.render_template( 'docs.html', select='docs', @@ -1964,7 +1890,6 @@ def view_docs(repo, username=None, filename=None): username=username, filename=filename, endpoint='view_docs', - watch=watch, ) @@ -1982,14 +1907,9 @@ def view_project_activity(repo): if not repo_obj: flask.abort(404, 'Project not found') - watch = False - if authenticated(): - watch = pagure.lib.is_watching(SESSION, flask.g.fas_user, repo) - return flask.render_template( 'activity.html', repo=repo_obj, - watch=watch, ) From b6556439c215284dc06fd9a0309facc4c38be374 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Jul 11 2016 14:56:51 +0000 Subject: [PATCH 6/7] If there is no watcher found, retrieve the project from the db This is needed since we then check if the user is watching based on commit rights and/or group membership. --- diff --git a/pagure/lib/__init__.py b/pagure/lib/__init__.py index c4032ac..76ee859 100644 --- a/pagure/lib/__init__.py +++ b/pagure/lib/__init__.py @@ -2859,6 +2859,11 @@ def is_watching(session, user, reponame, repouser=None): if watcher: return watcher.watch + + project = pagure.lib.get_project(session, reponame, user=repouser) + if not project: + return False + if user.username == project.user.username: return True From a4ea1733b2e2d2b8d66065453a42bd0605840988 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Jul 11 2016 14:57:42 +0000 Subject: [PATCH 7/7] Adjust the unit-tests for the change in pagure.lib.is_watching --- diff --git a/tests/test_pagure_lib.py b/tests/test_pagure_lib.py index 8b3d050..739c421 100644 --- a/tests/test_pagure_lib.py +++ b/tests/test_pagure_lib.py @@ -2280,7 +2280,7 @@ class PagureLibtests(tests.Modeltests): watch = pagure.lib.is_watching( session=self.session, user=None, - project=project, + reponame='test', ) self.assertFalse(watch) @@ -2290,7 +2290,7 @@ class PagureLibtests(tests.Modeltests): watch = pagure.lib.is_watching( session=self.session, user=user, - project=project, + reponame='test', ) self.assertFalse(watch) @@ -2318,7 +2318,7 @@ class PagureLibtests(tests.Modeltests): watch = pagure.lib.is_watching( session=self.session, user=user, - project=project, + reponame='test', ) self.assertTrue(watch) @@ -2327,7 +2327,7 @@ class PagureLibtests(tests.Modeltests): watch = pagure.lib.is_watching( session=self.session, user=user, - project=project, + reponame='test', ) self.assertTrue(watch) @@ -2344,7 +2344,7 @@ class PagureLibtests(tests.Modeltests): watch = pagure.lib.is_watching( session=self.session, user=user, - project=project, + reponame='test', ) self.assertTrue(watch) @@ -2361,7 +2361,7 @@ class PagureLibtests(tests.Modeltests): watch = pagure.lib.is_watching( session=self.session, user=user, - project=project, + reponame='test', ) self.assertFalse(watch)