From 00f2c8d0e06401f435b0d0038fd02da71ae216f4 Mon Sep 17 00:00:00 2001 From: Gaurav Kumar Date: Jun 14 2016 13:11:20 +0000 Subject: [PATCH 1/10] Added watch feature. --- diff --git a/pagure/forms.py b/pagure/forms.py index a9d1e0a..3072838 100644 --- a/pagure/forms.py +++ b/pagure/forms.py @@ -20,6 +20,21 @@ PROJECT_NAME_REGEX = \ '^[a-zA-z0-9_][a-zA-Z0-9-_]*(/?[a-zA-z0-9_][a-zA-Z0-9-_]+)?$' +class WatchForm(wtf.Form): + ''' Form to update the watch status of a project for the requested user. ''' + repo_name = wtforms.TextField( + 'Repo name', + [wtforms.validators.Required()] + ) + repo_user = wtforms.TextField( + 'Repo User', + [wtforms.validators.optional()] + ) + watch = wtforms.TextField( + 'Watch', + [wtforms.validators.Required()] + ) + class ProjectFormSimplified(wtf.Form): ''' Form to edit the description of a project. ''' description = wtforms.TextField( diff --git a/pagure/lib/__init__.py b/pagure/lib/__init__.py index 8f36cd7..c00b940 100644 --- a/pagure/lib/__init__.py +++ b/pagure/lib/__init__.py @@ -2748,3 +2748,38 @@ def get_pull_request_of_user(session, username): ) return query.all() + +def update_watch_status(session, project, user, watch): + ''' Update the user status for watching a project. + ''' + user_obj = __get_user(session, user) + + if not user_obj: + raise pagure.exceptions.PagureException( + 'No user with username: %s' % user) + + watcher = session.query( + model.Watcher + ).filter( + sqlalchemy.and_( + model.Watcher.project_id == project.id, + model.Watcher.user_id == user_obj.id, + ) + ).first() + + if not watcher: + watcher = model.Watcher( + project_id=project.id, + user_id=user_obj.id, + watch=watch + ) + else: + watcher.watch = watch + + session.add(watcher) + session.flush() + + msg_success = 'From now you are watching this repo.' + if not int(watch): + msg_success = 'You are no longer watching this repo.' + return msg_success diff --git a/pagure/lib/model.py b/pagure/lib/model.py index 4ba212f..e4ec0a2 100644 --- a/pagure/lib/model.py +++ b/pagure/lib/model.py @@ -332,6 +332,10 @@ class Project(BASE): backref="projects", ) + unwatchers = relation("Watcher", + primaryjoin="and_(Project.id==Watcher.project_id, " + "Watcher.watch=='1')") + @property def path(self): ''' Return the name of the git repo on the filesystem. ''' @@ -482,6 +486,31 @@ class Project(BASE): return output + @property + def watchers_list(self): + ''' Return the list of username of users watching this project. + ''' + + watchers = set([self.user.user]) + for user in self.users: + if user.default_email: + watchers.add(user.user) + + for group in self.groups: + if group.creator.default_email: + watchers.add(group.creator.user) + for user in group.users: + if user.default_email: + watchers.add(user.default_email) + + for watcher in self.watchers: + if watcher.user.default_email and not watcher.watch: + watchers.delete(watcher.user.user) + if watcher.user.user not in watchers: + watchers.add(watcher.user.user) + + return watchers + class ProjectUser(BASE): """ Stores the user of a projects. @@ -1296,6 +1325,45 @@ class ProjectGroup(BASE): 'project_id', 'group_id'), ) +class Watcher(BASE): + """ Stores the user of a projects. + + Table -- watchers + """ + + __tablename__ = 'watchers' + __table_args__ = ( + sa.UniqueConstraint('project_id', 'user_id'), + ) + + id = sa.Column(sa.Integer, primary_key=True) + project_id = sa.Column( + sa.Integer, + sa.ForeignKey('projects.id', onupdate='CASCADE'), + nullable=False) + user_id = sa.Column( + sa.Integer, + sa.ForeignKey('users.id', onupdate='CASCADE'), + nullable=False, + index=True) + watch = sa.Column( + sa.Boolean, + nullable=False) + + user = relation( + 'User', foreign_keys=[user_id], remote_side=[User.id], + backref=backref( + 'watchers', cascade="delete, delete-orphan" + ), + ) + + project = relation( + 'Project', foreign_keys=[project_id], remote_side=[Project.id], + backref=backref( + 'watchers', cascade="delete, delete-orphan", + ), + ) + # # Class and tables specific for the API/token access # diff --git a/pagure/lib/notify.py b/pagure/lib/notify.py index 9e501d8..af58dc2 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) + # Remove the person list in unwatch + for unwatcher in issue.project.unwatchers: + if unwatcher.user.default_email in emails: + emails.delete(unwatcher.user.default_email) + # Drop the email used by pagure when sending emails = _clean_emails( emails, pagure.APP.config.get(pagure.APP.config.get( diff --git a/pagure/static/pagure.css b/pagure/static/pagure.css index ba55e94..7af4cd3 100644 --- a/pagure/static/pagure.css +++ b/pagure/static/pagure.css @@ -538,6 +538,7 @@ th[data-sort] { cursor: pointer; } +<<<<<<< 8e8c5a2fffb08f092e660188ae889367a5523ddd .pr-changes-description { font-size: 0.8em; @@ -560,4 +561,8 @@ th[data-sort] { } @media (min-width:1200px) { .pr_comment_form .card, .inline-pr-comment .card{max-width:680px} +======= +#watch_project a { + cursor: pointer; +>>>>>>> Added watch feature. } diff --git a/pagure/templates/repo_master.html b/pagure/templates/repo_master.html index b33fa8f..f319938 100644 --- a/pagure/templates/repo_master.html +++ b/pagure/templates/repo_master.html @@ -27,6 +27,61 @@ id="fork_project"> Fork {{ forkbuttonform.csrf_token }} +<<<<<<< 8e8c5a2fffb08f092e660188ae889367a5523ddd +======= + {% endif %} + + {% if authenticated %} +
+ + +
+
+ + + + Unwatch + Watch + {{ forkbuttonform.csrf_token }} +
+
+
+ {% endif %} + {% if branchname %} +
+ + +
+ {% for branch in branches %} + {% if origin == 'view_commits' %} + + {{ branch }} + + {% elif origin == 'view_repo_branch' or origin == 'view_repo' %} + + {{ branch }} + + {% elif origin == 'view_tree' %} + + {{ branch }} + + {% elif origin == 'view_file' %} + + {{ branch }} + + {% endif %} + {% endfor %} +
+>>>>>>> Added watch feature.
{% endif %} @@ -185,3 +240,25 @@ {% endblock %} {% endblock %} + +{% block jscripts %} +{{ super() }} + +{% endblock %} \ No newline at end of file diff --git a/pagure/ui/repo.py b/pagure/ui/repo.py index 79aa0d4..5f28240 100644 --- a/pagure/ui/repo.py +++ b/pagure/ui/repo.py @@ -1831,3 +1831,36 @@ def view_project_activity(repo): 'activity.html', repo=repo_obj, ) + +@APP.route('/watch', methods=['POST']) +@APP.route('/watch/', methods=['POST']) +def watch_repo(): + """ Marked for watching or Unwatching + """ + previous_url = flask.request.referrer + form = pagure.forms.WatchForm() + if form.validate_on_submit(): + watch = form.watch.data + repo_name = form.repo_name.data + repo_user = form.repo_user.data + username = flask.g.fas_user.username + if repo_user: + repo_obj = pagure.lib.get_project(SESSION, repo_name, repo_user) + else: + repo_obj = pagure.lib.get_project(SESSION, repo_name) + + if not repo_obj: + flask.abort(404, 'Project not found') + + try: + msg = pagure.lib.update_watch_status( + SESSION, repo_obj, + username, watch + ) + SESSION.commit() + flask.flash(msg) + except pagure.exceptions.PagureException as msg: + SESSION.rollback() + flask.flash(msg, 'error') + + return flask.redirect(previous_url) diff --git a/tests/test_pagure_flask_ui_repo.py b/tests/test_pagure_flask_ui_repo.py index 62f0462..9c2fcbd 100644 --- a/tests/test_pagure_flask_ui_repo.py +++ b/tests/test_pagure_flask_ui_repo.py @@ -2922,6 +2922,57 @@ index 0000000..fb7093d output = self.app.get('/foo/activity/') self.assertEqual(output.status_code, 404) + def test_watch_repo(self): + """ Test the watch_repo endpoint. """ + + output = self.app.get('/foo/watch') + self.assertEqual(output.status_code, 404) + tests.create_projects(self.session) + + user = tests.FakeUser() + user.username = 'pingou' + with tests.user_set(pagure.APP, user): + + output = self.app.get('/new/') + self.assertEqual(output.status_code, 200) + self.assertIn('Create new Project', output.data) + + csrf_token = output.data.split( + 'name="csrf_token" type="hidden" value="')[1].split('">')[0] + + data = { + 'csrf_token': csrf_token + } + data['repo_name'] = 'test' + data['watch'] = 1 + + output = self.app.post( + '/watch/', data=data) + self.assertEqual(output.status_code, 302) + repo = pagure.lib.get_project(self.session, 'test') + msg = pagure.lib.update_watch_status( + session=self.session, + project=repo, + user=user.username, + watch=data['watch'], + ) + self.session.commit() + self.assertEqual(msg, 'From now you are watching this repo.') + + data['watch'] = 0 + + output = self.app.post( + '/watch/', data=data) + self.assertEqual(output.status_code, 302) + repo = pagure.lib.get_project(self.session, 'test') + msg = pagure.lib.update_watch_status( + session=self.session, + project=repo, + user=user.username, + watch=data['watch'], + ) + self.session.commit() + self.assertEqual(msg, 'You are no longer watching this repo.') if __name__ == '__main__': SUITE = unittest.TestLoader().loadTestsFromTestCase(PagureFlaskRepotests) From 604af68560d61c2bc7b78f9ae8d02348fafeccf5 Mon Sep 17 00:00:00 2001 From: Gaurav Kumar Date: Jun 14 2016 13:11:20 +0000 Subject: [PATCH 2/10] Few modifications for watch feature. --- diff --git a/pagure/forms.py b/pagure/forms.py index 3072838..a9d1e0a 100644 --- a/pagure/forms.py +++ b/pagure/forms.py @@ -20,21 +20,6 @@ PROJECT_NAME_REGEX = \ '^[a-zA-z0-9_][a-zA-Z0-9-_]*(/?[a-zA-z0-9_][a-zA-Z0-9-_]+)?$' -class WatchForm(wtf.Form): - ''' Form to update the watch status of a project for the requested user. ''' - repo_name = wtforms.TextField( - 'Repo name', - [wtforms.validators.Required()] - ) - repo_user = wtforms.TextField( - 'Repo User', - [wtforms.validators.optional()] - ) - watch = wtforms.TextField( - 'Watch', - [wtforms.validators.Required()] - ) - class ProjectFormSimplified(wtf.Form): ''' Form to edit the description of a project. ''' description = wtforms.TextField( diff --git a/pagure/lib/__init__.py b/pagure/lib/__init__.py index c00b940..e3f33a3 100644 --- a/pagure/lib/__init__.py +++ b/pagure/lib/__init__.py @@ -2783,3 +2783,35 @@ def update_watch_status(session, project, user, watch): if not int(watch): msg_success = 'You are no longer watching this repo.' return msg_success + +def is_watching(session, user, project): + ''' Check user watching the project. ''' + + user_obj = __get_user(session, user) + if not user_obj: + raise pagure.exceptions.PagureException( + 'No user with username: %s' % user) + + watcher = session.query( + model.Watcher + ).filter( + sqlalchemy.and_( + model.Watcher.project_id == project.id, + model.Watcher.user_id == user_obj.id, + ) + ).first() + + if watcher: + return watcher.watch + + if user == project.user.user: + return True + + watch=False + for group in project.groups: + for guser in group.users: + if user == guser.username: + watch=True + break + + return watch diff --git a/pagure/static/pagure.css b/pagure/static/pagure.css index 7af4cd3..5c430ad 100644 --- a/pagure/static/pagure.css +++ b/pagure/static/pagure.css @@ -538,7 +538,6 @@ th[data-sort] { cursor: pointer; } -<<<<<<< 8e8c5a2fffb08f092e660188ae889367a5523ddd .pr-changes-description { font-size: 0.8em; @@ -561,8 +560,7 @@ th[data-sort] { } @media (min-width:1200px) { .pr_comment_form .card, .inline-pr-comment .card{max-width:680px} -======= + #watch_project a { cursor: pointer; ->>>>>>> Added watch feature. } diff --git a/pagure/templates/repo_master.html b/pagure/templates/repo_master.html index f319938..a49cf4c 100644 --- a/pagure/templates/repo_master.html +++ b/pagure/templates/repo_master.html @@ -27,8 +27,6 @@ id="fork_project"> Fork {{ forkbuttonform.csrf_token }} -<<<<<<< 8e8c5a2fffb08f092e660188ae889367a5523ddd -======= {% endif %} {% if authenticated %} @@ -38,13 +36,10 @@ Toggle Dropdown
-
- - - - Unwatch - Watch - {{ forkbuttonform.csrf_token }} + + Unwatch + Watch + {{ forkbuttonform.csrf_token }}
@@ -81,7 +76,6 @@ {% endif %} {% endfor %} ->>>>>>> Added watch feature. {% endif %} @@ -248,12 +242,14 @@ $(document).ready(function() { $(".watch-menu a").click(function(){ var selectedValue = $(this).text(); var currentValue = $("#watch-button").text(); + var action = $("#watch_project").attr('action'); if (currentValue == selectedValue) { if (selectedValue != "Watch") { - $("#watch").val('0'); $("#watch-button").html("Watch"); } else { $("#watch").val('1'); + action = action.replace('/0/', '/1/'); + $('#watch_project').attr('action', action); $("#watch-button").html("Unwatch"); } $('#watch_project').submit(); diff --git a/pagure/ui/repo.py b/pagure/ui/repo.py index 5f28240..7e428d5 100644 --- a/pagure/ui/repo.py +++ b/pagure/ui/repo.py @@ -1832,35 +1832,38 @@ def view_project_activity(repo): repo=repo_obj, ) -@APP.route('/watch', methods=['POST']) -@APP.route('/watch/', methods=['POST']) -def watch_repo(): +@APP.route('/watch///', methods=['POST']) +@APP.route('/watch///', methods=['POST']) +def watch_repo(repo, watch, user=None): """ Marked for watching or Unwatching """ - previous_url = flask.request.referrer - form = pagure.forms.WatchForm() - if form.validate_on_submit(): - watch = form.watch.data - repo_name = form.repo_name.data - repo_user = form.repo_user.data - username = flask.g.fas_user.username - if repo_user: - repo_obj = pagure.lib.get_project(SESSION, repo_name, repo_user) - else: - repo_obj = pagure.lib.get_project(SESSION, repo_name) + return_point = flask.url_for('index') + if pagure.is_safe_url(flask.request.referrer): + return_point = flask.request.referrer - if not repo_obj: - flask.abort(404, 'Project not found') + form = pagure.forms.ConfirmationForm() + if not form.validate_on_submit(): + flask.abort(400) - try: - msg = pagure.lib.update_watch_status( - SESSION, repo_obj, - username, watch - ) - SESSION.commit() - flask.flash(msg) - except pagure.exceptions.PagureException as msg: - SESSION.rollback() - flask.flash(msg, 'error') + if str(watch) not in ['0', '1']: + flask.abort(400) + + username = flask.g.fas_user.username + repo_obj = pagure.lib.get_project(SESSION, repo) + if user is not None: + repo_obj = pagure.lib.get_project(SESSION, repo, user) + + if not repo_obj: + flask.abort(404, 'Project not found') + + try: + msg = pagure.lib.update_watch_status( + SESSION, repo_obj, + username, watch + ) + SESSION.commit() + flask.flash(msg) + except pagure.exceptions.PagureException as msg: + flask.flash(msg, 'error') - return flask.redirect(previous_url) + return flask.redirect(return_point) diff --git a/tests/test_pagure_flask_ui_repo.py b/tests/test_pagure_flask_ui_repo.py index 9c2fcbd..e0a2085 100644 --- a/tests/test_pagure_flask_ui_repo.py +++ b/tests/test_pagure_flask_ui_repo.py @@ -2925,8 +2925,9 @@ index 0000000..fb7093d def test_watch_repo(self): """ Test the watch_repo endpoint. """ - output = self.app.get('/foo/watch') - self.assertEqual(output.status_code, 404) + output = self.app.post('/watch/') + self.assertEqual(output.status_code, 405) + tests.create_projects(self.session) user = tests.FakeUser() @@ -2941,38 +2942,53 @@ index 0000000..fb7093d 'name="csrf_token" type="hidden" value="')[1].split('">')[0] data = { - 'csrf_token': csrf_token + 'csrf_token':csrf_token } - data['repo_name'] = 'test' - data['watch'] = 1 + output = self.app.post( + '/watch', data=data, follow_redirects=True) + self.assertEqual(output.status_code, 404) output = self.app.post( - '/watch/', data=data) - self.assertEqual(output.status_code, 302) - repo = pagure.lib.get_project(self.session, 'test') - msg = pagure.lib.update_watch_status( - session=self.session, - project=repo, - user=user.username, - watch=data['watch'], - ) - self.session.commit() - self.assertEqual(msg, 'From now you are watching this repo.') + '/watch/foo', data=data, follow_redirects=True) + self.assertEqual(output.status_code, 404) - data['watch'] = 0 + output = self.app.post( + '/watch/test/2/', data=data, follow_redirects=True) + self.assertEqual(output.status_code, 400) output = self.app.post( - '/watch/', data=data) - self.assertEqual(output.status_code, 302) - repo = pagure.lib.get_project(self.session, 'test') - msg = pagure.lib.update_watch_status( - session=self.session, - project=repo, - user=user.username, - watch=data['watch'], + '/watch/test/0/', data=data, follow_redirects=True) + self.assertIn( + '\n You are no longer' + ' watching this repo.', output.data) + + output = self.app.post( + '/watch/test/1/', data=data, follow_redirects=True) + self.assertIn( + '\n From now you are' + ' watching this repo.', output.data) + + item = pagure.lib.model.Project( + user_id=2, # foo + name='test', + description='test project #1', + hook_token='aaabbb', + parent_id=1, ) + self.session.add(item) self.session.commit() - self.assertEqual(msg, 'You are no longer watching this repo.') + + output = self.app.post( + '/watch/test/0/foo', data=data, follow_redirects=True) + self.assertIn( + '\n You are no longer' + ' watching this repo.', output.data) + + output = self.app.post( + '/watch/test/1/foo', data=data, follow_redirects=True) + self.assertIn( + '\n From now you are' + ' watching this repo.', output.data) if __name__ == '__main__': SUITE = unittest.TestLoader().loadTestsFromTestCase(PagureFlaskRepotests) From 12485a70b908aa342159073d82d5d37b95e33de4 Mon Sep 17 00:00:00 2001 From: Gaurav Kumar Date: Jun 14 2016 13:11:20 +0000 Subject: [PATCH 3/10] Set select for docs link. --- diff --git a/pagure/ui/repo.py b/pagure/ui/repo.py index 7e428d5..9faad99 100644 --- a/pagure/ui/repo.py +++ b/pagure/ui/repo.py @@ -1806,6 +1806,7 @@ def view_docs(repo, username=None, filename=None): return flask.render_template( 'docs.html', + select='docs', repo=repo_obj, username=username, filename=filename, From f3f4347f18d8a53c25c6489a65f40076b01b87fb Mon Sep 17 00:00:00 2001 From: Gaurav Kumar Date: Jun 14 2016 13:11:20 +0000 Subject: [PATCH 4/10] Modifications in watch_repo route. --- diff --git a/pagure/templates/repo_master.html b/pagure/templates/repo_master.html index a49cf4c..e47258d 100644 --- a/pagure/templates/repo_master.html +++ b/pagure/templates/repo_master.html @@ -36,7 +36,7 @@ Toggle Dropdown
-
+ Unwatch Watch {{ forkbuttonform.csrf_token }} @@ -248,7 +248,7 @@ $(document).ready(function() { $("#watch-button").html("Watch"); } else { $("#watch").val('1'); - action = action.replace('/0/', '/1/'); + action = action.replace('/0', '/1'); $('#watch_project').attr('action', action); $("#watch-button").html("Unwatch"); } diff --git a/pagure/ui/repo.py b/pagure/ui/repo.py index 9faad99..7848718 100644 --- a/pagure/ui/repo.py +++ b/pagure/ui/repo.py @@ -1833,8 +1833,8 @@ def view_project_activity(repo): repo=repo_obj, ) -@APP.route('/watch///', methods=['POST']) -@APP.route('/watch///', methods=['POST']) +@APP.route('/watch//settings/', methods=['POST']) +@APP.route('/watch/fork///settings/', methods=['POST']) def watch_repo(repo, watch, user=None): """ Marked for watching or Unwatching """ diff --git a/tests/test_pagure_flask_ui_repo.py b/tests/test_pagure_flask_ui_repo.py index e0a2085..2d8def4 100644 --- a/tests/test_pagure_flask_ui_repo.py +++ b/tests/test_pagure_flask_ui_repo.py @@ -2953,17 +2953,17 @@ index 0000000..fb7093d self.assertEqual(output.status_code, 404) output = self.app.post( - '/watch/test/2/', data=data, follow_redirects=True) + '/watch/test/settings/2', data=data, follow_redirects=True) self.assertEqual(output.status_code, 400) output = self.app.post( - '/watch/test/0/', data=data, follow_redirects=True) + '/watch/test/settings/0', data=data, follow_redirects=True) self.assertIn( '\n You are no longer' ' watching this repo.', output.data) output = self.app.post( - '/watch/test/1/', data=data, follow_redirects=True) + '/watch/test/settings/1', data=data, follow_redirects=True) self.assertIn( '\n From now you are' ' watching this repo.', output.data) @@ -2979,13 +2979,13 @@ index 0000000..fb7093d self.session.commit() output = self.app.post( - '/watch/test/0/foo', data=data, follow_redirects=True) + '/watch/fork/foo/test/settings/0', data=data, follow_redirects=True) self.assertIn( '\n You are no longer' ' watching this repo.', output.data) output = self.app.post( - '/watch/test/1/foo', data=data, follow_redirects=True) + '/watch/fork/foo/test/settings/1', data=data, follow_redirects=True) self.assertIn( '\n From now you are' ' watching this repo.', output.data) From 39ee6c4b681e0bb39bcbe8c9388c7611e829d297 Mon Sep 17 00:00:00 2001 From: Gaurav Kumar Date: Jun 14 2016 13:11:20 +0000 Subject: [PATCH 5/10] Added is_watching method. --- diff --git a/pagure/lib/__init__.py b/pagure/lib/__init__.py index e3f33a3..d81dc41 100644 --- a/pagure/lib/__init__.py +++ b/pagure/lib/__init__.py @@ -2804,14 +2804,13 @@ def is_watching(session, user, project): if watcher: return watcher.watch + watch=False if user == project.user.user: return True - watch=False for group in project.groups: - for guser in group.users: - if user == guser.username: - watch=True - break + if user in group.users: + watch=True + break return watch diff --git a/pagure/lib/model.py b/pagure/lib/model.py index e4ec0a2..104688f 100644 --- a/pagure/lib/model.py +++ b/pagure/lib/model.py @@ -334,7 +334,7 @@ class Project(BASE): unwatchers = relation("Watcher", primaryjoin="and_(Project.id==Watcher.project_id, " - "Watcher.watch=='1')") + "Watcher.watch=='0')") @property def path(self): @@ -486,31 +486,6 @@ class Project(BASE): return output - @property - def watchers_list(self): - ''' Return the list of username of users watching this project. - ''' - - watchers = set([self.user.user]) - for user in self.users: - if user.default_email: - watchers.add(user.user) - - for group in self.groups: - if group.creator.default_email: - watchers.add(group.creator.user) - for user in group.users: - if user.default_email: - watchers.add(user.default_email) - - for watcher in self.watchers: - if watcher.user.default_email and not watcher.watch: - watchers.delete(watcher.user.user) - if watcher.user.user not in watchers: - watchers.add(watcher.user.user) - - return watchers - class ProjectUser(BASE): """ Stores the user of a projects. diff --git a/pagure/templates/repo_master.html b/pagure/templates/repo_master.html index e47258d..dd58575 100644 --- a/pagure/templates/repo_master.html +++ b/pagure/templates/repo_master.html @@ -31,7 +31,7 @@ {% if authenticated %}
- + diff --git a/pagure/ui/repo.py b/pagure/ui/repo.py index 7848718..824e220 100644 --- a/pagure/ui/repo.py +++ b/pagure/ui/repo.py @@ -147,6 +147,7 @@ def view_repo(repo, username=None): diff_commits=diff_commits, repo_admin=is_repo_admin(repo), form=pagure.forms.ConfirmationForm(), + watch=pagure.lib.is_watching(SESSION, flask.g.fas_user.username, repo), ) @@ -247,6 +248,7 @@ def view_repo_branch(repo, branchname, username=None): diff_commits=diff_commits, repo_admin=is_repo_admin(repo), form=pagure.forms.ConfirmationForm(), + watch=pagure.lib.is_watching(SESSION, flask.g.fas_user.username, repo), ) @@ -361,6 +363,7 @@ def view_commits(repo, branchname=None, username=None): total_page=total_page, repo_admin=is_repo_admin(repo), form=pagure.forms.ConfirmationForm(), + watch=pagure.lib.is_watching(SESSION, flask.g.fas_user.username, repo), ) @@ -471,6 +474,7 @@ def view_file(repo, identifier, filename, username=None): content=content, output_type=output_type, repo_admin=is_repo_admin(repo), + watch=pagure.lib.is_watching(SESSION, flask.g.fas_user.username, repo), ), 200, headers @@ -632,6 +636,7 @@ def view_commit(repo, commitid, username=None): commitid=commitid, commit=commit, diff=diff, + watch=pagure.lib.is_watching(SESSION, flask.g.fas_user.username, repo), ) @@ -720,6 +725,7 @@ def view_tree(repo, identifier=None, username=None): content=content, output_type=output_type, repo_admin=is_repo_admin(repo), + watch=pagure.lib.is_watching(SESSION, flask.g.fas_user.username, repo), ) @@ -741,6 +747,7 @@ def view_forks(repo, username=None): username=username, repo=repo, repo_admin=is_repo_admin(repo), + watch=pagure.lib.is_watching(SESSION, flask.g.fas_user.username, repo), ) @@ -768,6 +775,7 @@ def view_tags(repo, username=None): tags=tags, repo_admin=is_repo_admin(repo), repo_obj=repo_obj, + watch=pagure.lib.is_watching(SESSION, flask.g.fas_user.username, repo), ) @@ -818,6 +826,7 @@ def new_release(repo, username=None): username=username, repo=repo, form=form, + watch=pagure.lib.is_watching(SESSION, flask.g.fas_user.username, repo), ) @@ -904,6 +913,7 @@ def view_settings(repo, username=None): plugins=plugins, repo_admin=repo_admin, branchname = branchname, + watch=pagure.lib.is_watching(SESSION, flask.g.fas_user.username, repo), ) @@ -1500,6 +1510,7 @@ def add_group_project(repo, username=None): form=form, username=username, repo=repo, + watch=pagure.lib.is_watching(SESSION, flask.g.fas_user.username, repo), ) @@ -1606,6 +1617,7 @@ def add_token(repo, username=None): repo_admin=repo_admin, username=username, repo=repo, + watch=pagure.lib.is_watching(SESSION, flask.g.fas_user.username, repo), ) @@ -1748,6 +1760,7 @@ def edit_file(repo, branchname, filename, username=None): form=form, user=user, branches=repo_obj.listall_branches(), + watch=pagure.lib.is_watching(SESSION, flask.g.fas_user.username, repo), ) @@ -1812,6 +1825,7 @@ def view_docs(repo, username=None, filename=None): filename=filename, endpoint='view_docs', select='docs', + watch=pagure.lib.is_watching(SESSION, flask.g.fas_user.username, repo_obj), ) @APP.route('//activity/') From cece6fbc3385fc3ce00bd40c5f179331059a4437 Mon Sep 17 00:00:00 2001 From: Gaurav Kumar Date: Jun 14 2016 13:11:20 +0000 Subject: [PATCH 6/10] Added test methods for lib watch methods. --- diff --git a/pagure/lib/__init__.py b/pagure/lib/__init__.py index d81dc41..c8bff8f 100644 --- a/pagure/lib/__init__.py +++ b/pagure/lib/__init__.py @@ -2809,8 +2809,9 @@ def is_watching(session, user, project): return True for group in project.groups: - if user in group.users: - watch=True - break + for guser in group.users: + if user == guser.username: + watch=True + break return watch diff --git a/tests/test_pagure_lib.py b/tests/test_pagure_lib.py index 100275c..9f1abe6 100644 --- a/tests/test_pagure_lib.py +++ b/tests/test_pagure_lib.py @@ -2233,6 +2233,126 @@ class PagureLibtests(tests.Modeltests): user='pingou', ) + def test_update_watch_status(self): + """ Test the update_watch_status method of pagure.lib. """ + tests.create_projects(self.session) + + project = pagure.lib.get_project(self.session, 'test') + + # User does not exist + self.assertRaises( + pagure.exceptions.PagureException, + pagure.lib.update_watch_status, + session=self.session, + project=project, + user='aavrug', + watch='1', + ) + + # All good and when user seleted watch option. + msg = pagure.lib.update_watch_status( + session=self.session, + project=project, + user='pingou', + watch='1', + ) + self.session.commit() + self.assertEqual(msg, 'From now you are watching this repo.') + + # All good and when user selected unwatch option. + msg = pagure.lib.update_watch_status( + session=self.session, + project=project, + user='pingou', + watch='0', + ) + self.session.commit() + self.assertEqual(msg, 'You are no longer watching this repo.') + + def test_is_watching(self): + """ Test the is_watching method of pagure.lib. """ + tests.create_projects(self.session) + self.test_add_group() + + project = pagure.lib.get_project(self.session, 'test') + + # User does not exist + self.assertRaises( + pagure.exceptions.PagureException, + pagure.lib.is_watching, + session=self.session, + user='aavrug', + project=project, + ) + + pagure.lib.add_group_to_project( + session=self.session, + project=project, + new_group='foo', + user='pingou', + ) + self.session.commit() + + group = pagure.lib.search_groups(self.session, group_name='foo') + pagure.lib.add_user_to_group( + self.session, + username='foo', + group=group, + user='pingou', + is_admin=False, + ) + self.session.commit() + + # If user belongs to any group of that project + watch = pagure.lib.is_watching( + session=self.session, + user='foo', + project=project, + ) + self.assertTrue(watch) + + # If user is the creator + watch = pagure.lib.is_watching( + session=self.session, + user='pingou', + project=project, + ) + self.assertTrue(watch) + + # Entry into watchers table + pagure.lib.update_watch_status( + session=self.session, + project=project, + user='pingou', + watch='1', + ) + self.session.commit() + + # From watchers table + watch = pagure.lib.is_watching( + session=self.session, + user='pingou', + project=project, + ) + self.assertTrue(watch) + + # Entry into watchers table + pagure.lib.update_watch_status( + session=self.session, + project=project, + user='pingou', + watch='0', + ) + self.session.commit() + + # From watchers table + watch = pagure.lib.is_watching( + session=self.session, + user='pingou', + project=project, + ) + self.assertFalse(watch) + if __name__ == '__main__': SUITE = unittest.TestLoader().loadTestsFromTestCase(PagureLibtests) From 4e29d19eb21b7b44f60897c429e4254ed4cb47b7 Mon Sep 17 00:00:00 2001 From: Gaurav Kumar Date: Jun 14 2016 13:11:20 +0000 Subject: [PATCH 7/10] Fixed Attribute error related to username. --- diff --git a/pagure/lib/__init__.py b/pagure/lib/__init__.py index c8bff8f..ccbb8fd 100644 --- a/pagure/lib/__init__.py +++ b/pagure/lib/__init__.py @@ -2787,6 +2787,10 @@ def update_watch_status(session, project, user, watch): def is_watching(session, user, project): ''' Check user watching the project. ''' + if user is None: + return False + + user = user.username user_obj = __get_user(session, user) if not user_obj: raise pagure.exceptions.PagureException( diff --git a/pagure/lib/notify.py b/pagure/lib/notify.py index af58dc2..5af9526 100644 --- a/pagure/lib/notify.py +++ b/pagure/lib/notify.py @@ -125,7 +125,7 @@ def _get_emails_for_issue(issue): # Remove the person list in unwatch for unwatcher in issue.project.unwatchers: if unwatcher.user.default_email in emails: - emails.delete(unwatcher.user.default_email) + emails.remove(unwatcher.user.default_email) # Drop the email used by pagure when sending emails = _clean_emails( diff --git a/pagure/ui/repo.py b/pagure/ui/repo.py index 824e220..db94706 100644 --- a/pagure/ui/repo.py +++ b/pagure/ui/repo.py @@ -147,7 +147,7 @@ def view_repo(repo, username=None): diff_commits=diff_commits, repo_admin=is_repo_admin(repo), form=pagure.forms.ConfirmationForm(), - watch=pagure.lib.is_watching(SESSION, flask.g.fas_user.username, repo), + watch=pagure.lib.is_watching(SESSION, flask.g.fas_user, repo), ) @@ -248,7 +248,7 @@ def view_repo_branch(repo, branchname, username=None): diff_commits=diff_commits, repo_admin=is_repo_admin(repo), form=pagure.forms.ConfirmationForm(), - watch=pagure.lib.is_watching(SESSION, flask.g.fas_user.username, repo), + watch=pagure.lib.is_watching(SESSION, flask.g.fas_user, repo), ) @@ -363,7 +363,7 @@ def view_commits(repo, branchname=None, username=None): total_page=total_page, repo_admin=is_repo_admin(repo), form=pagure.forms.ConfirmationForm(), - watch=pagure.lib.is_watching(SESSION, flask.g.fas_user.username, repo), + watch=pagure.lib.is_watching(SESSION, flask.g.fas_user, repo), ) @@ -474,7 +474,7 @@ def view_file(repo, identifier, filename, username=None): content=content, output_type=output_type, repo_admin=is_repo_admin(repo), - watch=pagure.lib.is_watching(SESSION, flask.g.fas_user.username, repo), + watch=pagure.lib.is_watching(SESSION, flask.g.fas_user, repo), ), 200, headers @@ -636,7 +636,7 @@ def view_commit(repo, commitid, username=None): commitid=commitid, commit=commit, diff=diff, - watch=pagure.lib.is_watching(SESSION, flask.g.fas_user.username, repo), + watch=pagure.lib.is_watching(SESSION, flask.g.fas_user, repo), ) @@ -725,7 +725,7 @@ def view_tree(repo, identifier=None, username=None): content=content, output_type=output_type, repo_admin=is_repo_admin(repo), - watch=pagure.lib.is_watching(SESSION, flask.g.fas_user.username, repo), + watch=pagure.lib.is_watching(SESSION, flask.g.fas_user, repo), ) @@ -747,7 +747,7 @@ def view_forks(repo, username=None): username=username, repo=repo, repo_admin=is_repo_admin(repo), - watch=pagure.lib.is_watching(SESSION, flask.g.fas_user.username, repo), + watch=pagure.lib.is_watching(SESSION, flask.g.fas_user, repo), ) @@ -775,7 +775,7 @@ def view_tags(repo, username=None): tags=tags, repo_admin=is_repo_admin(repo), repo_obj=repo_obj, - watch=pagure.lib.is_watching(SESSION, flask.g.fas_user.username, repo), + watch=pagure.lib.is_watching(SESSION, flask.g.fas_user, repo), ) @@ -826,7 +826,7 @@ def new_release(repo, username=None): username=username, repo=repo, form=form, - watch=pagure.lib.is_watching(SESSION, flask.g.fas_user.username, repo), + watch=pagure.lib.is_watching(SESSION, flask.g.fas_user, repo), ) @@ -913,7 +913,7 @@ def view_settings(repo, username=None): plugins=plugins, repo_admin=repo_admin, branchname = branchname, - watch=pagure.lib.is_watching(SESSION, flask.g.fas_user.username, repo), + watch=pagure.lib.is_watching(SESSION, flask.g.fas_user, repo), ) @@ -1510,7 +1510,7 @@ def add_group_project(repo, username=None): form=form, username=username, repo=repo, - watch=pagure.lib.is_watching(SESSION, flask.g.fas_user.username, repo), + watch=pagure.lib.is_watching(SESSION, flask.g.fas_user, repo), ) @@ -1617,7 +1617,7 @@ def add_token(repo, username=None): repo_admin=repo_admin, username=username, repo=repo, - watch=pagure.lib.is_watching(SESSION, flask.g.fas_user.username, repo), + watch=pagure.lib.is_watching(SESSION, flask.g.fas_user, repo), ) @@ -1760,7 +1760,7 @@ def edit_file(repo, branchname, filename, username=None): form=form, user=user, branches=repo_obj.listall_branches(), - watch=pagure.lib.is_watching(SESSION, flask.g.fas_user.username, repo), + watch=pagure.lib.is_watching(SESSION, flask.g.fas_user, repo), ) @@ -1824,8 +1824,7 @@ def view_docs(repo, username=None, filename=None): username=username, filename=filename, endpoint='view_docs', - select='docs', - watch=pagure.lib.is_watching(SESSION, flask.g.fas_user.username, repo_obj), + watch=pagure.lib.is_watching(SESSION, flask.g.fas_user, repo_obj), ) @APP.route('//activity/') diff --git a/tests/test_pagure_lib.py b/tests/test_pagure_lib.py index 9f1abe6..7d624ee 100644 --- a/tests/test_pagure_lib.py +++ b/tests/test_pagure_lib.py @@ -2276,12 +2276,22 @@ class PagureLibtests(tests.Modeltests): project = pagure.lib.get_project(self.session, 'test') + # If user not logged in + watch = pagure.lib.is_watching( + session=self.session, + user=None, + project=project, + ) + self.assertFalse(watch) + # User does not exist + user = tests.FakeUser() + user.username = 'aavrug' self.assertRaises( pagure.exceptions.PagureException, pagure.lib.is_watching, session=self.session, - user='aavrug', + user=user, project=project, ) @@ -2304,17 +2314,19 @@ class PagureLibtests(tests.Modeltests): self.session.commit() # If user belongs to any group of that project + user.username = 'foo' watch = pagure.lib.is_watching( session=self.session, - user='foo', + user=user, project=project, ) self.assertTrue(watch) # If user is the creator + user.username = 'pingou' watch = pagure.lib.is_watching( session=self.session, - user='pingou', + user=user, project=project, ) self.assertTrue(watch) @@ -2331,7 +2343,7 @@ class PagureLibtests(tests.Modeltests): # From watchers table watch = pagure.lib.is_watching( session=self.session, - user='pingou', + user=user, project=project, ) self.assertTrue(watch) @@ -2348,7 +2360,7 @@ class PagureLibtests(tests.Modeltests): # From watchers table watch = pagure.lib.is_watching( session=self.session, - user='pingou', + user=user, project=project, ) self.assertFalse(watch) From 6cf17845b76c7ece728f5c3acc2d215947d0834c Mon Sep 17 00:00:00 2001 From: Gaurav Kumar Date: Jun 14 2016 13:11:20 +0000 Subject: [PATCH 8/10] Modified message string for watch option. --- diff --git a/pagure/lib/__init__.py b/pagure/lib/__init__.py index ccbb8fd..340fd3f 100644 --- a/pagure/lib/__init__.py +++ b/pagure/lib/__init__.py @@ -2779,7 +2779,7 @@ def update_watch_status(session, project, user, watch): session.add(watcher) session.flush() - msg_success = 'From now you are watching this repo.' + msg_success = 'You are now watching this repo.' if not int(watch): msg_success = 'You are no longer watching this repo.' return msg_success diff --git a/tests/test_pagure_flask_ui_repo.py b/tests/test_pagure_flask_ui_repo.py index 2d8def4..3e49701 100644 --- a/tests/test_pagure_flask_ui_repo.py +++ b/tests/test_pagure_flask_ui_repo.py @@ -2965,7 +2965,7 @@ index 0000000..fb7093d output = self.app.post( '/watch/test/settings/1', data=data, follow_redirects=True) self.assertIn( - '\n From now you are' + '\n You are now' ' watching this repo.', output.data) item = pagure.lib.model.Project( @@ -2987,7 +2987,7 @@ index 0000000..fb7093d output = self.app.post( '/watch/fork/foo/test/settings/1', data=data, follow_redirects=True) self.assertIn( - '\n From now you are' + '\n You are now' ' watching this repo.', output.data) if __name__ == '__main__': From c65751909742b23faf0540f25d89111daa7b8fbe Mon Sep 17 00:00:00 2001 From: Gaurav Kumar Date: Jun 14 2016 13:11:21 +0000 Subject: [PATCH 9/10] Added login required for wathc_repo. --- diff --git a/pagure/ui/repo.py b/pagure/ui/repo.py index db94706..5a17114 100644 --- a/pagure/ui/repo.py +++ b/pagure/ui/repo.py @@ -1848,6 +1848,7 @@ def view_project_activity(repo): @APP.route('/watch//settings/', methods=['POST']) @APP.route('/watch/fork///settings/', methods=['POST']) +@login_required def watch_repo(repo, watch, user=None): """ Marked for watching or Unwatching """ From c3eca0e8d2abf0ec3ffe11ab6a0f605adaf10f14 Mon Sep 17 00:00:00 2001 From: Gaurav Kumar Date: Jun 14 2016 13:11:21 +0000 Subject: [PATCH 10/10] Fixed indentation. --- diff --git a/pagure/lib/model.py b/pagure/lib/model.py index 104688f..2475936 100644 --- a/pagure/lib/model.py +++ b/pagure/lib/model.py @@ -332,9 +332,11 @@ class Project(BASE): backref="projects", ) - unwatchers = relation("Watcher", - primaryjoin="and_(Project.id==Watcher.project_id, " - "Watcher.watch=='0')") + unwatchers = relation( + "Watcher", + primaryjoin="and_(Project.id==Watcher.project_id, " + "Watcher.watch=='0')" + ) @property def path(self):