diff --git a/rhodecode/__init__.py b/rhodecode/__init__.py
--- a/rhodecode/__init__.py
+++ b/rhodecode/__init__.py
@@ -48,7 +48,7 @@ PYRAMID_SETTINGS = {}
EXTENSIONS = {}
__version__ = ('.'.join((str(each) for each in VERSION[:3])))
-__dbversion__ = 109 # defines current db version for migrations
+__dbversion__ = 110 # defines current db version for migrations
__platform__ = platform.system()
__license__ = 'AGPLv3, and Commercial License'
__author__ = 'RhodeCode GmbH'
diff --git a/rhodecode/api/views/pull_request_api.py b/rhodecode/api/views/pull_request_api.py
--- a/rhodecode/api/views/pull_request_api.py
+++ b/rhodecode/api/views/pull_request_api.py
@@ -704,7 +704,7 @@ def create_pull_request(
user = get_user_or_error(reviewer_object['username'])
reviewer_object['user_id'] = user.user_id
- get_default_reviewers_data, validate_default_reviewers = \
+ get_default_reviewers_data, validate_default_reviewers, validate_observers = \
PullRequestModel().get_reviewer_functions()
# recalculate reviewers logic, to make sure we can validate this
@@ -865,14 +865,13 @@ def update_pull_request(
user = get_user_or_error(reviewer_object['username'])
reviewer_object['user_id'] = user.user_id
- get_default_reviewers_data, get_validated_reviewers = \
+ get_default_reviewers_data, get_validated_reviewers, validate_observers = \
PullRequestModel().get_reviewer_functions()
# re-use stored rules
reviewer_rules = pull_request.reviewer_data
try:
- reviewers = get_validated_reviewers(
- reviewer_objects, reviewer_rules)
+ reviewers = get_validated_reviewers(reviewer_objects, reviewer_rules)
except ValueError as e:
raise JSONRPCError('Reviewers Validation: {}'.format(e))
else:
diff --git a/rhodecode/apps/debug_style/views.py b/rhodecode/apps/debug_style/views.py
--- a/rhodecode/apps/debug_style/views.py
+++ b/rhodecode/apps/debug_style/views.py
@@ -34,6 +34,7 @@ log = logging.getLogger(__name__)
class DebugStyleView(BaseAppView):
+
def load_default_context(self):
c = self._get_local_tmpl_context()
@@ -75,6 +76,7 @@ Check if we should use full-topic or min
source_ref_parts=AttributeDict(type='branch', name='fix-ticket-2000'),
target_ref_parts=AttributeDict(type='branch', name='master'),
)
+
target_repo = AttributeDict(repo_name='repo_group/target_repo')
source_repo = AttributeDict(repo_name='repo_group/source_repo')
user = User.get_by_username(self.request.GET.get('user')) or self._rhodecode_db_user
@@ -83,6 +85,7 @@ Check if we should use full-topic or min
'added': ['aaaaaaabbbbb', 'cccccccddddddd'],
'removed': ['eeeeeeeeeee'],
})
+
file_changes = AttributeDict({
'added': ['a/file1.md', 'file2.py'],
'modified': ['b/modified_file.rst'],
@@ -97,15 +100,19 @@ Check if we should use full-topic or min
'exc_message': 'Traceback (most recent call last):\n File "/nix/store/s43k2r9rysfbzmsjdqnxgzvvb7zjhkxb-python2.7-pyramid-1.10.4/lib/python2.7/site-packages/pyramid/tweens.py", line 41, in excview_tween\n response = handler(request)\n File "/nix/store/s43k2r9rysfbzmsjdqnxgzvvb7zjhkxb-python2.7-pyramid-1.10.4/lib/python2.7/site-packages/pyramid/router.py", line 148, in handle_request\n registry, request, context, context_iface, view_name\n File "/nix/store/s43k2r9rysfbzmsjdqnxgzvvb7zjhkxb-python2.7-pyramid-1.10.4/lib/python2.7/site-packages/pyramid/view.py", line 667, in _call_view\n response = view_callable(context, request)\n File "/nix/store/s43k2r9rysfbzmsjdqnxgzvvb7zjhkxb-python2.7-pyramid-1.10.4/lib/python2.7/site-packages/pyramid/config/views.py", line 188, in attr_view\n return view(context, request)\n File "/nix/store/s43k2r9rysfbzmsjdqnxgzvvb7zjhkxb-python2.7-pyramid-1.10.4/lib/python2.7/site-packages/pyramid/config/views.py", line 214, in predicate_wrapper\n return view(context, request)\n File "/nix/store/s43k2r9rysfbzmsjdqnxgzvvb7zjhkxb-python2.7-pyramid-1.10.4/lib/python2.7/site-packages/pyramid/viewderivers.py", line 401, in viewresult_to_response\n result = view(context, request)\n File "/nix/store/s43k2r9rysfbzmsjdqnxgzvvb7zjhkxb-python2.7-pyramid-1.10.4/lib/python2.7/site-packages/pyramid/viewderivers.py", line 132, in _class_view\n response = getattr(inst, attr)()\n File "/mnt/hgfs/marcink/workspace/rhodecode-enterprise-ce/rhodecode/apps/debug_style/views.py", line 355, in render_email\n template_type, **email_kwargs.get(email_id, {}))\n File "/mnt/hgfs/marcink/workspace/rhodecode-enterprise-ce/rhodecode/model/notification.py", line 402, in render_email\n body = email_template.render(None, **_kwargs)\n File "/mnt/hgfs/marcink/workspace/rhodecode-enterprise-ce/rhodecode/lib/partial_renderer.py", line 95, in render\n return self._render_with_exc(tmpl, args, kwargs)\n File "/mnt/hgfs/marcink/workspace/rhodecode-enterprise-ce/rhodecode/lib/partial_renderer.py", line 79, in _render_with_exc\n return render_func.render(*args, **kwargs)\n File "/nix/store/dakh34sxz4yfr435c0cwjz0sd6hnd5g3-python2.7-mako-1.1.0/lib/python2.7/site-packages/mako/template.py", line 476, in render\n return runtime._render(self, self.callable_, args, data)\n File "/nix/store/dakh34sxz4yfr435c0cwjz0sd6hnd5g3-python2.7-mako-1.1.0/lib/python2.7/site-packages/mako/runtime.py", line 883, in _render\n **_kwargs_for_callable(callable_, data)\n File "/nix/store/dakh34sxz4yfr435c0cwjz0sd6hnd5g3-python2.7-mako-1.1.0/lib/python2.7/site-packages/mako/runtime.py", line 920, in _render_context\n _exec_template(inherit, lclcontext, args=args, kwargs=kwargs)\n File "/nix/store/dakh34sxz4yfr435c0cwjz0sd6hnd5g3-python2.7-mako-1.1.0/lib/python2.7/site-packages/mako/runtime.py", line 947, in _exec_template\n callable_(context, *args, **kwargs)\n File "rhodecode_templates_email_templates_base_mako", line 63, in render_body\n File "rhodecode_templates_email_templates_exception_tracker_mako", line 43, in render_body\nAttributeError: \'str\' object has no attribute \'get\'\n',
'exc_type': 'AttributeError'
}
+
email_kwargs = {
'test': {},
+
'message': {
'body': 'message body !'
},
+
'email_test': {
'user': user,
'date': datetime.datetime.now(),
},
+
'exception': {
'email_prefix': '[RHODECODE ERROR]',
'exc_id': exc_traceback['exc_id'],
@@ -113,6 +120,7 @@ Check if we should use full-topic or min
'exc_type_name': 'NameError',
'exc_traceback': exc_traceback,
},
+
'password_reset': {
'password_reset_url': 'http://example.com/reset-rhodecode-password/token',
@@ -121,6 +129,7 @@ Check if we should use full-topic or min
'email': 'test@rhodecode.com',
'first_admin_email': User.get_first_super_admin().email
},
+
'password_reset_confirmation': {
'new_password': 'new-password-example',
'user': user,
@@ -128,6 +137,7 @@ Check if we should use full-topic or min
'email': 'test@rhodecode.com',
'first_admin_email': User.get_first_super_admin().email
},
+
'registration': {
'user': user,
'date': datetime.datetime.now(),
@@ -161,6 +171,7 @@ Check if we should use full-topic or min
'mention': True,
},
+
'pull_request_comment+status': {
'user': user,
@@ -201,6 +212,7 @@ def db():
'mention': True,
},
+
'pull_request_comment+file': {
'user': user,
@@ -303,6 +315,7 @@ This should work better !
'renderer_type': 'markdown',
'mention': True,
},
+
'cs_comment+status': {
'user': user,
'commit': AttributeDict(idx=123, raw_id='a' * 40, message='Commit message'),
@@ -328,6 +341,7 @@ This is a multiline comment :)
'renderer_type': 'markdown',
'mention': True,
},
+
'cs_comment+file': {
'user': user,
'commit': AttributeDict(idx=123, raw_id='a' * 40, message='Commit message'),
@@ -348,12 +362,37 @@ This is a multiline comment :)
'renderer_type': 'markdown',
'mention': True,
},
-
+
'pull_request': {
'user': user,
'pull_request': pr,
'pull_request_commits': [
('472d1df03bf7206e278fcedc6ac92b46b01c4e21', '''\
+ my-account: moved email closer to profile as it's similar data just moved outside.
+ '''),
+ ('cbfa3061b6de2696c7161ed15ba5c6a0045f90a7', '''\
+ users: description edit fixes
+
+ - tests
+ - added metatags info
+ '''),
+ ],
+
+ 'pull_request_target_repo': target_repo,
+ 'pull_request_target_repo_url': 'http://target-repo/url',
+
+ 'pull_request_source_repo': source_repo,
+ 'pull_request_source_repo_url': 'http://source-repo/url',
+
+ 'pull_request_url': 'http://code.rhodecode.com/_pull-request/123',
+ 'user_role': 'reviewer',
+ },
+
+ 'pull_request+reviewer_role': {
+ 'user': user,
+ 'pull_request': pr,
+ 'pull_request_commits': [
+ ('472d1df03bf7206e278fcedc6ac92b46b01c4e21', '''\
my-account: moved email closer to profile as it's similar data just moved outside.
'''),
('cbfa3061b6de2696c7161ed15ba5c6a0045f90a7', '''\
@@ -371,8 +410,33 @@ users: description edit fixes
'pull_request_source_repo_url': 'http://source-repo/url',
'pull_request_url': 'http://code.rhodecode.com/_pull-request/123',
+ 'user_role': 'reviewer',
+ },
+
+ 'pull_request+observer_role': {
+ 'user': user,
+ 'pull_request': pr,
+ 'pull_request_commits': [
+ ('472d1df03bf7206e278fcedc6ac92b46b01c4e21', '''\
+ my-account: moved email closer to profile as it's similar data just moved outside.
+ '''),
+ ('cbfa3061b6de2696c7161ed15ba5c6a0045f90a7', '''\
+ users: description edit fixes
+
+ - tests
+ - added metatags info
+ '''),
+ ],
+
+ 'pull_request_target_repo': target_repo,
+ 'pull_request_target_repo_url': 'http://target-repo/url',
+
+ 'pull_request_source_repo': source_repo,
+ 'pull_request_source_repo_url': 'http://source-repo/url',
+
+ 'pull_request_url': 'http://code.rhodecode.com/_pull-request/123',
+ 'user_role': 'observer'
}
-
}
template_type = email_id.split('+')[0]
@@ -401,6 +465,7 @@ users: description edit fixes
c = self.load_default_context()
c.active = os.path.splitext(t_path)[0]
c.came_from = ''
+ # NOTE(marcink): extend the email types with variations based on data sets
c.email_types = {
'cs_comment+file': {},
'cs_comment+status': {},
@@ -409,6 +474,9 @@ users: description edit fixes
'pull_request_comment+status': {},
'pull_request_update': {},
+
+ 'pull_request+reviewer_role': {},
+ 'pull_request+observer_role': {},
}
c.email_types.update(EmailNotificationModel.email_types)
diff --git a/rhodecode/apps/repository/utils.py b/rhodecode/apps/repository/utils.py
--- a/rhodecode/apps/repository/utils.py
+++ b/rhodecode/apps/repository/utils.py
@@ -21,11 +21,13 @@
from rhodecode.lib import helpers as h
from rhodecode.lib.utils2 import safe_int
from rhodecode.model.pull_request import get_diff_info
-
-REVIEWER_API_VERSION = 'V3'
+from rhodecode.model.db import PullRequestReviewers
+# V3 - Reviewers, with default rules data
+# v4 - Added observers metadata
+REVIEWER_API_VERSION = 'V4'
-def reviewer_as_json(user, reasons=None, mandatory=False, rules=None, user_group=None):
+def reviewer_as_json(user, reasons=None, role=None, mandatory=False, rules=None, user_group=None):
"""
Returns json struct of a reviewer for frontend
@@ -33,11 +35,15 @@ def reviewer_as_json(user, reasons=None,
:param reasons: list of strings of why they are reviewers
:param mandatory: bool, to set user as mandatory
"""
+ role = role or PullRequestReviewers.ROLE_REVIEWER
+ if role not in PullRequestReviewers.ROLES:
+ raise ValueError('role is not one of %s', PullRequestReviewers.ROLES)
return {
'user_id': user.user_id,
'reasons': reasons or [],
'rules': rules or [],
+ 'role': role,
'mandatory': mandatory,
'user_group': user_group,
'username': user.username,
@@ -48,8 +54,7 @@ def reviewer_as_json(user, reasons=None,
}
-def get_default_reviewers_data(
- current_user, source_repo, source_commit, target_repo, target_commit):
+def get_default_reviewers_data(current_user, source_repo, source_commit, target_repo, target_commit):
"""
Return json for default reviewers of a repository
"""
@@ -59,7 +64,7 @@ def get_default_reviewers_data(
reasons = ['Default reviewer', 'Repository owner']
json_reviewers = [reviewer_as_json(
- user=target_repo.user, reasons=reasons, mandatory=False, rules=None)]
+ user=target_repo.user, reasons=reasons, mandatory=False, rules=None, role=None)]
return {
'api_ver': REVIEWER_API_VERSION, # define version for later possible schema upgrade
@@ -73,15 +78,18 @@ def get_default_reviewers_data(
def validate_default_reviewers(review_members, reviewer_rules):
"""
Function to validate submitted reviewers against the saved rules
-
"""
reviewers = []
reviewer_by_id = {}
for r in review_members:
reviewer_user_id = safe_int(r['user_id'])
- entry = (reviewer_user_id, r['reasons'], r['mandatory'], r['rules'])
+ entry = (reviewer_user_id, r['reasons'], r['mandatory'], r['role'], r['rules'])
reviewer_by_id[reviewer_user_id] = entry
reviewers.append(entry)
return reviewers
+
+
+def validate_observers(observer_members):
+ return {}
diff --git a/rhodecode/apps/repository/views/repo_commits.py b/rhodecode/apps/repository/views/repo_commits.py
--- a/rhodecode/apps/repository/views/repo_commits.py
+++ b/rhodecode/apps/repository/views/repo_commits.py
@@ -193,7 +193,7 @@ class RepoCommitsView(RepoAppView):
for review_obj, member, reasons, mandatory, status in review_statuses:
member_reviewer = h.reviewer_as_json(
- member, reasons=reasons, mandatory=mandatory,
+ member, reasons=reasons, mandatory=mandatory, role=None,
user_group=None
)
diff --git a/rhodecode/apps/repository/views/repo_pull_requests.py b/rhodecode/apps/repository/views/repo_pull_requests.py
--- a/rhodecode/apps/repository/views/repo_pull_requests.py
+++ b/rhodecode/apps/repository/views/repo_pull_requests.py
@@ -39,14 +39,15 @@ from rhodecode.lib.ext_json import json
from rhodecode.lib.auth import (
LoginRequired, HasRepoPermissionAny, HasRepoPermissionAnyDecorator,
NotAnonymous, CSRFRequired)
-from rhodecode.lib.utils2 import str2bool, safe_str, safe_unicode, safe_int
+from rhodecode.lib.utils2 import str2bool, safe_str, safe_unicode, safe_int, aslist
from rhodecode.lib.vcs.backends.base import EmptyCommit, UpdateFailureReason
from rhodecode.lib.vcs.exceptions import (
CommitDoesNotExistError, RepositoryRequirementError, EmptyRepositoryError)
from rhodecode.model.changeset_status import ChangesetStatusModel
from rhodecode.model.comment import CommentsModel
from rhodecode.model.db import (
- func, or_, PullRequest, ChangesetComment, ChangesetStatus, Repository)
+ func, or_, PullRequest, ChangesetComment, ChangesetStatus, Repository,
+ PullRequestReviewers)
from rhodecode.model.forms import PullRequestForm
from rhodecode.model.meta import Session
from rhodecode.model.pull_request import PullRequestModel, MergeCheck
@@ -455,14 +456,18 @@ class RepoPullRequestsView(RepoAppView,
return self._get_template_context(c)
c.allowed_reviewers = [obj.user_id for obj in pull_request.reviewers if obj.user]
+ c.reviewers_count = pull_request.reviewers_count
+ c.observers_count = pull_request.observers_count
# reviewers and statuses
c.pull_request_default_reviewers_data_json = json.dumps(pull_request.reviewer_data)
c.pull_request_set_reviewers_data_json = collections.OrderedDict({'reviewers': []})
+ c.pull_request_set_observers_data_json = collections.OrderedDict({'observers': []})
for review_obj, member, reasons, mandatory, status in pull_request_at_ver.reviewers_statuses():
member_reviewer = h.reviewer_as_json(
member, reasons=reasons, mandatory=mandatory,
+ role=review_obj.role,
user_group=review_obj.rule_user_group_data()
)
@@ -474,6 +479,17 @@ class RepoPullRequestsView(RepoAppView,
c.pull_request_set_reviewers_data_json = json.dumps(c.pull_request_set_reviewers_data_json)
+ for observer_obj, member in pull_request_at_ver.observers():
+ member_observer = h.reviewer_as_json(
+ member, reasons=[], mandatory=False,
+ role=observer_obj.role,
+ user_group=observer_obj.rule_user_group_data()
+ )
+ member_observer['allowed_to_update'] = c.allowed_to_update
+ c.pull_request_set_observers_data_json['observers'].append(member_observer)
+
+ c.pull_request_set_observers_data_json = json.dumps(c.pull_request_set_observers_data_json)
+
general_comments, inline_comments = \
self.register_comments_vars(c, pull_request_latest, versions)
@@ -967,7 +983,7 @@ class RepoPullRequestsView(RepoAppView,
'repository.read', 'repository.write', 'repository.admin')
@view_config(
route_name='pullrequest_comments', request_method='POST',
- renderer='string', xhr=True)
+ renderer='string_html', xhr=True)
def pullrequest_comments(self):
self.load_default_context()
@@ -998,7 +1014,8 @@ class RepoPullRequestsView(RepoAppView,
all_comments = c.inline_comments_flat + c.comments
existing_ids = filter(
- lambda e: e, map(safe_int, self.request.POST.getall('comments[]')))
+ lambda e: e, map(safe_int, aslist(self.request.POST.get('comments'))))
+
return _render('comments_table', all_comments, len(all_comments),
existing_ids=existing_ids)
@@ -1008,7 +1025,7 @@ class RepoPullRequestsView(RepoAppView,
'repository.read', 'repository.write', 'repository.admin')
@view_config(
route_name='pullrequest_todos', request_method='POST',
- renderer='string', xhr=True)
+ renderer='string_html', xhr=True)
def pullrequest_todos(self):
self.load_default_context()
@@ -1138,7 +1155,7 @@ class RepoPullRequestsView(RepoAppView,
target_ref_type, target_ref_name, __ = _form['target_ref'].split(':')
target_ref = ':'.join((target_ref_type, target_ref_name, ancestor))
- get_default_reviewers_data, validate_default_reviewers = \
+ get_default_reviewers_data, validate_default_reviewers, validate_observers = \
PullRequestModel().get_reviewer_functions()
# recalculate reviewers logic, to make sure we can validate this
@@ -1146,9 +1163,8 @@ class RepoPullRequestsView(RepoAppView,
self._rhodecode_db_user, source_db_repo,
source_commit, target_db_repo, target_commit)
- given_reviewers = _form['review_members']
- reviewers = validate_default_reviewers(
- given_reviewers, reviewer_rules)
+ reviewers = validate_default_reviewers(_form['review_members'], reviewer_rules)
+ observers = validate_observers(_form['observer_members'], reviewer_rules)
pullrequest_title = _form['pullrequest_title']
title_source_ref = source_ref.split(':', 2)[1]
@@ -1172,6 +1188,7 @@ class RepoPullRequestsView(RepoAppView,
revisions=commit_ids,
common_ancestor_id=common_ancestor_id,
reviewers=reviewers,
+ observers=observers,
title=pullrequest_title,
description=description,
description_renderer=description_renderer,
@@ -1227,14 +1244,23 @@ class RepoPullRequestsView(RepoAppView,
# only owner or admin can update it
allowed_to_update = PullRequestModel().check_user_update(
pull_request, self._rhodecode_user)
+
if allowed_to_update:
controls = peppercorn.parse(self.request.POST.items())
force_refresh = str2bool(self.request.POST.get('force_refresh'))
if 'review_members' in controls:
self._update_reviewers(
+ c,
pull_request, controls['review_members'],
- pull_request.reviewer_data)
+ pull_request.reviewer_data,
+ PullRequestReviewers.ROLE_REVIEWER)
+ elif 'observer_members' in controls:
+ self._update_reviewers(
+ c,
+ pull_request, controls['observer_members'],
+ pull_request.reviewer_data,
+ PullRequestReviewers.ROLE_OBSERVER)
elif str2bool(self.request.POST.get('update_commits', 'false')):
if is_state_changing:
log.debug('commits update: forbidden because pull request is in state %s',
@@ -1255,6 +1281,7 @@ class RepoPullRequestsView(RepoAppView,
elif str2bool(self.request.POST.get('edit_pull_request', 'false')):
self._edit_pull_request(pull_request)
else:
+ log.error('Unhandled update data.')
raise HTTPBadRequest()
return {'response': True,
@@ -1262,6 +1289,9 @@ class RepoPullRequestsView(RepoAppView,
raise HTTPForbidden()
def _edit_pull_request(self, pull_request):
+ """
+ Edit title and description
+ """
_ = self.request.translate
try:
@@ -1302,27 +1332,14 @@ class RepoPullRequestsView(RepoAppView,
msg = _(u'Pull request updated to "{source_commit_id}" with '
u'{count_added} added, {count_removed} removed commits. '
- u'Source of changes: {change_source}')
+ u'Source of changes: {change_source}.')
msg = msg.format(
source_commit_id=pull_request.source_ref_parts.commit_id,
count_added=len(resp.changes.added),
count_removed=len(resp.changes.removed),
change_source=changed)
h.flash(msg, category='success')
-
- message = msg + (
- ' - '
- '{} '.format(_('Reload page')))
-
- message_obj = {
- 'message': message,
- 'level': 'success',
- 'topic': '/notifications'
- }
-
- channelstream.post_message(
- c.pr_broadcast_channel, message_obj, self._rhodecode_user.username,
- registry=self.request.registry)
+ self._pr_update_channelstream_push(c.pr_broadcast_channel, msg)
else:
msg = PullRequestModel.UPDATE_STATUS_MESSAGES[resp.reason]
warning_reasons = [
@@ -1332,6 +1349,53 @@ class RepoPullRequestsView(RepoAppView,
category = 'warning' if resp.reason in warning_reasons else 'error'
h.flash(msg, category=category)
+ def _update_reviewers(self, c, pull_request, review_members, reviewer_rules, role):
+ _ = self.request.translate
+
+ get_default_reviewers_data, validate_default_reviewers, validate_observers = \
+ PullRequestModel().get_reviewer_functions()
+
+ if role == PullRequestReviewers.ROLE_REVIEWER:
+ try:
+ reviewers = validate_default_reviewers(review_members, reviewer_rules)
+ except ValueError as e:
+ log.error('Reviewers Validation: {}'.format(e))
+ h.flash(e, category='error')
+ return
+
+ old_calculated_status = pull_request.calculated_review_status()
+ PullRequestModel().update_reviewers(
+ pull_request, reviewers, self._rhodecode_user)
+
+ Session().commit()
+
+ msg = _('Pull request reviewers updated.')
+ h.flash(msg, category='success')
+ self._pr_update_channelstream_push(c.pr_broadcast_channel, msg)
+
+ # trigger status changed if change in reviewers changes the status
+ calculated_status = pull_request.calculated_review_status()
+ if old_calculated_status != calculated_status:
+ PullRequestModel().trigger_pull_request_hook(
+ pull_request, self._rhodecode_user, 'review_status_change',
+ data={'status': calculated_status})
+
+ elif role == PullRequestReviewers.ROLE_OBSERVER:
+ try:
+ observers = validate_observers(review_members, reviewer_rules)
+ except ValueError as e:
+ log.error('Observers Validation: {}'.format(e))
+ h.flash(e, category='error')
+ return
+
+ PullRequestModel().update_observers(
+ pull_request, observers, self._rhodecode_user)
+
+ Session().commit()
+ msg = _('Pull request observers updated.')
+ h.flash(msg, category='success')
+ self._pr_update_channelstream_push(c.pr_broadcast_channel, msg)
+
@LoginRequired()
@NotAnonymous()
@HasRepoPermissionAnyDecorator(
@@ -1408,32 +1472,6 @@ class RepoPullRequestsView(RepoAppView,
msg = merge_resp.merge_status_message
h.flash(msg, category='error')
- def _update_reviewers(self, pull_request, review_members, reviewer_rules):
- _ = self.request.translate
-
- get_default_reviewers_data, validate_default_reviewers = \
- PullRequestModel().get_reviewer_functions()
-
- try:
- reviewers = validate_default_reviewers(review_members, reviewer_rules)
- except ValueError as e:
- log.error('Reviewers Validation: {}'.format(e))
- h.flash(e, category='error')
- return
-
- old_calculated_status = pull_request.calculated_review_status()
- PullRequestModel().update_reviewers(
- pull_request, reviewers, self._rhodecode_user)
- h.flash(_('Pull request reviewers updated.'), category='success')
- Session().commit()
-
- # trigger status changed if change in reviewers changes the status
- calculated_status = pull_request.calculated_review_status()
- if old_calculated_status != calculated_status:
- PullRequestModel().trigger_pull_request_hook(
- pull_request, self._rhodecode_user, 'review_status_change',
- data={'status': calculated_status})
-
@LoginRequired()
@NotAnonymous()
@HasRepoPermissionAnyDecorator(
@@ -1488,8 +1526,7 @@ class RepoPullRequestsView(RepoAppView,
allowed_to_comment = PullRequestModel().check_user_comment(
pull_request, self._rhodecode_user)
if not allowed_to_comment:
- log.debug(
- 'comment: forbidden because pull request is from forbidden repo')
+ log.debug('comment: forbidden because pull request is from forbidden repo')
raise HTTPForbidden()
c = self.load_default_context()
diff --git a/rhodecode/config/middleware.py b/rhodecode/config/middleware.py
--- a/rhodecode/config/middleware.py
+++ b/rhodecode/config/middleware.py
@@ -341,6 +341,10 @@ def includeme(config):
name='json_ext',
factory='rhodecode.lib.ext_json_renderer.pyramid_ext_json')
+ config.add_renderer(
+ name='string_html',
+ factory='rhodecode.lib.string_renderer.html')
+
# include RhodeCode plugins
includes = aslist(settings.get('rhodecode.includes', []))
for inc in includes:
diff --git a/rhodecode/lib/audit_logger.py b/rhodecode/lib/audit_logger.py
--- a/rhodecode/lib/audit_logger.py
+++ b/rhodecode/lib/audit_logger.py
@@ -88,6 +88,9 @@ ACTIONS_V1 = {
'repo.pull_request.reviewer.add': '',
'repo.pull_request.reviewer.delete': '',
+ 'repo.pull_request.observer.add': '',
+ 'repo.pull_request.observer.delete': '',
+
'repo.commit.strip': {'commit_id': ''},
'repo.commit.comment.create': {'data': {}},
'repo.commit.comment.delete': {'data': {}},
diff --git a/rhodecode/lib/dbmigrate/versions/110_version_4_22_0.py b/rhodecode/lib/dbmigrate/versions/110_version_4_22_0.py
new file mode 100644
--- /dev/null
+++ b/rhodecode/lib/dbmigrate/versions/110_version_4_22_0.py
@@ -0,0 +1,68 @@
+# -*- coding: utf-8 -*-
+
+import logging
+from sqlalchemy import *
+
+from alembic.migration import MigrationContext
+from alembic.operations import Operations
+
+from rhodecode.lib.dbmigrate.versions import _reset_base
+from rhodecode.model import meta, init_model_encryption
+
+
+log = logging.getLogger(__name__)
+
+
+def upgrade(migrate_engine):
+ """
+ Upgrade operations go here.
+ Don't create your own engine; bind migrate_engine to your metadata
+ """
+ _reset_base(migrate_engine)
+ from rhodecode.lib.dbmigrate.schema import db_4_20_0_0 as db
+
+ init_model_encryption(db)
+
+ context = MigrationContext.configure(migrate_engine.connect())
+ op = Operations(context)
+
+ table = db.RepoReviewRuleUser.__table__
+ with op.batch_alter_table(table.name) as batch_op:
+ new_column = Column('role', Unicode(255), nullable=True)
+ batch_op.add_column(new_column)
+
+ _fill_rule_user_role(op, meta.Session)
+
+ table = db.RepoReviewRuleUserGroup.__table__
+ with op.batch_alter_table(table.name) as batch_op:
+ new_column = Column('role', Unicode(255), nullable=True)
+ batch_op.add_column(new_column)
+
+ _fill_rule_user_group_role(op, meta.Session)
+
+
+def downgrade(migrate_engine):
+ meta = MetaData()
+ meta.bind = migrate_engine
+
+
+def fixups(models, _SESSION):
+ pass
+
+
+def _fill_rule_user_role(op, session):
+ params = {'role': 'reviewer'}
+ query = text(
+ 'UPDATE repo_review_rules_users SET role = :role'
+ ).bindparams(**params)
+ op.execute(query)
+ session().commit()
+
+
+def _fill_rule_user_group_role(op, session):
+ params = {'role': 'reviewer'}
+ query = text(
+ 'UPDATE repo_review_rules_users_groups SET role = :role'
+ ).bindparams(**params)
+ op.execute(query)
+ session().commit()
diff --git a/rhodecode/lib/helpers.py b/rhodecode/lib/helpers.py
--- a/rhodecode/lib/helpers.py
+++ b/rhodecode/lib/helpers.py
@@ -1104,6 +1104,10 @@ def bool2icon(value, show_at_false=True)
return HTML.tag('i', class_="icon-false", title='False')
return HTML.tag('i')
+
+def b64(inp):
+ return base64.b64encode(inp)
+
#==============================================================================
# PERMS
#==============================================================================
diff --git a/rhodecode/lib/string_renderer.py b/rhodecode/lib/string_renderer.py
new file mode 100644
--- /dev/null
+++ b/rhodecode/lib/string_renderer.py
@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2010-2020 RhodeCode GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License, version 3
+# (only), as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see - {0}
'.format(ruleText)
};
+ this.increaseCounter = function(role) {
+ if (role === self.ROLE_REVIEWER) {
+ var $elem = $('#reviewers-cnt')
+ var cnt = parseInt($elem.data('count') || 0)
+ cnt +=1
+ $elem.html(cnt);
+ $elem.data('count', cnt);
+ }
+ else if (role === self.ROLE_OBSERVER) {
+ var $elem = $('#observers-cnt');
+ var cnt = parseInt($elem.data('count') || 0)
+ cnt +=1
+ $elem.html(cnt);
+ $elem.data('count', cnt);
+ }
+ }
+
+ this.resetCounter = function () {
+ var $elem = $('#reviewers-cnt');
+
+ $elem.data('count', 0);
+ $elem.html(0);
+
+ var $elem = $('#observers-cnt');
+
+ $elem.data('count', 0);
+ $elem.html(0);
+ }
+
this.loadReviewRules = function (data) {
self.diffData = data;
// reset forbidden Users
- this.forbidReviewUsers = self.defaultForbidReviewUsers();
+ this.forbidUsers = self.defaultForbidUsers();
// reset state of review rules
self.$rulesList.html('');
@@ -148,7 +185,7 @@ ReviewersController = function () {
self.addRule(
_gettext('All reviewers must vote.'))
);
- return self.forbidReviewUsers
+ return self.forbidUsers
}
if (data.rules.voting !== undefined) {
@@ -195,7 +232,7 @@ ReviewersController = function () {
}
if (data.rules.forbid_author_to_review) {
- self.forbidReviewUsers.push(data.rules_data.pr_author);
+ self.forbidUsers.push(data.rules_data.pr_author);
self.$rulesList.append(
self.addRule(
_gettext('Author is not allowed to be a reviewer.'))
@@ -206,9 +243,8 @@ ReviewersController = function () {
if (data.rules_data.forbidden_users) {
$.each(data.rules_data.forbidden_users, function (index, member_data) {
- self.forbidReviewUsers.push(member_data)
+ self.forbidUsers.push(member_data)
});
-
}
self.$rulesList.append(
@@ -223,9 +259,31 @@ ReviewersController = function () {
_gettext('No review rules set.'))
}
- return self.forbidReviewUsers
+ return self.forbidUsers
};
+ this.emptyTables = function () {
+ self.emptyReviewersTable();
+ self.emptyObserversTable();
+
+ // Also reset counters.
+ self.resetCounter();
+ }
+
+ this.emptyReviewersTable = function (withText) {
+ self.$reviewMembers.empty();
+ if (withText !== undefined) {
+ self.$reviewMembers.html(withText)
+ }
+ };
+
+ this.emptyObserversTable = function (withText) {
+ self.$observerMembers.empty();
+ if (withText !== undefined) {
+ self.$observerMembers.html(withText)
+ }
+ }
+
this.loadDefaultReviewers = function (sourceRepo, sourceRef, targetRepo, targetRef) {
if (self.currentRequest) {
@@ -233,19 +291,21 @@ ReviewersController = function () {
self.currentRequest.abort();
}
- $('.calculate-reviewers').show();
- // reset reviewer members
- self.$reviewMembers.empty();
+ self.$loadingIndicator.show();
+
+ // reset reviewer/observe members
+ self.emptyTables();
prButtonLock(true, null, 'reviewers');
$('#user').hide(); // hide user autocomplete before load
+ $('#observer').hide(); //hide observer autocomplete before load
// lock PR button, so we cannot send PR before it's calculated
prButtonLock(true, _gettext('Loading diff ...'), 'compare');
if (sourceRef.length !== 3 || targetRef.length !== 3) {
// don't load defaults in case we're missing some refs...
- $('.calculate-reviewers').hide();
+ self.$loadingIndicator.hide();
return
}
@@ -272,11 +332,16 @@ ReviewersController = function () {
for (var i = 0; i < data.reviewers.length; i++) {
var reviewer = data.reviewers[i];
- self.addReviewMember(reviewer, reviewer.reasons, reviewer.mandatory);
+ // load reviewer rules from the repo data
+ self.addMember(reviewer, reviewer.reasons, reviewer.mandatory, reviewer.role);
}
- $('.calculate-reviewers').hide();
+
+
+ self.$loadingIndicator.hide();
prButtonLock(false, null, 'reviewers');
- $('#user').show(); // show user autocomplete after load
+
+ $('#user').show(); // show user autocomplete before load
+ $('#observer').show(); // show observer autocomplete before load
var commitElements = data["diff_info"]['commits'];
@@ -292,7 +357,7 @@ ReviewersController = function () {
},
error: function (jqXHR, textStatus, errorThrown) {
- var prefix = "Loading diff and reviewers failed\n"
+ var prefix = "Loading diff and reviewers/observers failed\n"
var message = formatErrorMessage(jqXHR, textStatus, errorThrown, prefix);
ajaxErrorSwal(message);
}
@@ -301,7 +366,7 @@ ReviewersController = function () {
};
// check those, refactor
- this.removeReviewMember = function (reviewer_id, mark_delete) {
+ this.removeMember = function (reviewer_id, mark_delete) {
var reviewer = $('#reviewer_{0}'.format(reviewer_id));
if (typeof (mark_delete) === undefined) {
@@ -312,6 +377,7 @@ ReviewersController = function () {
if (reviewer) {
// now delete the input
$('#reviewer_{0} input'.format(reviewer_id)).remove();
+ $('#reviewer_{0}_rules input'.format(reviewer_id)).remove();
// mark as to-delete
var obj = $('#reviewer_{0}_name'.format(reviewer_id));
obj.addClass('to-delete');
@@ -322,27 +388,26 @@ ReviewersController = function () {
}
};
- this.reviewMemberEntry = function () {
+ this.addMember = function (reviewer_obj, reasons, mandatory, role) {
- };
-
- this.addReviewMember = function (reviewer_obj, reasons, mandatory) {
var id = reviewer_obj.user_id;
var username = reviewer_obj.username;
- var reasons = reasons || [];
- var mandatory = mandatory || false;
+ reasons = reasons || [];
+ mandatory = mandatory || false;
+ role = role || self.ROLE_REVIEWER
- // register IDS to check if we don't have this ID already in
+ // register current set IDS to check if we don't have this ID already in
+ // and prevent duplicates
var currentIds = [];
- $.each(self.$reviewMembers.find('.reviewer_entry'), function (index, value) {
+ $.each($('.reviewer_entry'), function (index, value) {
currentIds.push($(value).data('reviewerUserId'))
})
var userAllowedReview = function (userId) {
var allowed = true;
- $.each(self.forbidReviewUsers, function (index, member_data) {
+ $.each(self.forbidUsers, function (index, member_data) {
if (parseInt(userId) === member_data['user_id']) {
allowed = false;
return false // breaks the loop
@@ -352,6 +417,7 @@ ReviewersController = function () {
};
var userAllowed = userAllowedReview(id);
+
if (!userAllowed) {
alert(_gettext('User `{0}` not allowed to be a reviewer').format(username));
} else {
@@ -359,11 +425,13 @@ ReviewersController = function () {
var alreadyReviewer = currentIds.indexOf(id) != -1;
if (alreadyReviewer) {
- alert(_gettext('User `{0}` already in reviewers').format(username));
+ alert(_gettext('User `{0}` already in reviewers/observers').format(username));
} else {
+
var reviewerEntry = renderTemplate('reviewMemberEntry', {
'member': reviewer_obj,
'mandatory': mandatory,
+ 'role': role,
'reasons': reasons,
'allowed_to_update': true,
'review_status': 'not_reviewed',
@@ -372,16 +440,32 @@ ReviewersController = function () {
'create': true,
'rule_show': true,
})
- $(self.$reviewMembers.selector).append(reviewerEntry);
+
+ if (role === self.ROLE_REVIEWER) {
+ $(self.$reviewMembers.selector).append(reviewerEntry);
+ self.increaseCounter(self.ROLE_REVIEWER);
+ $('#reviewer-empty-msg').remove()
+ }
+ else if (role === self.ROLE_OBSERVER) {
+ $(self.$observerMembers.selector).append(reviewerEntry);
+ self.increaseCounter(self.ROLE_OBSERVER);
+ $('#observer-empty-msg').remove();
+ }
+
tooltipActivate();
}
}
};
- this.updateReviewers = function (repo_name, pull_request_id) {
- var postData = $('#reviewers input').serialize();
- _updatePullRequest(repo_name, pull_request_id, postData);
+ this.updateReviewers = function (repo_name, pull_request_id, role) {
+ if (role === 'reviewer') {
+ var postData = $('#reviewers input').serialize();
+ _updatePullRequest(repo_name, pull_request_id, postData);
+ } else if (role === 'observer') {
+ var postData = $('#observers input').serialize();
+ _updatePullRequest(repo_name, pull_request_id, postData);
+ }
};
this.handleDiffData = function (data) {
@@ -449,35 +533,26 @@ var editPullRequest = function(repo_name
/**
- * Reviewer autocomplete
+ * autocomplete handler for reviewers/observers
*/
-var ReviewerAutoComplete = function(inputId) {
- $(inputId).autocomplete({
- serviceUrl: pyroutes.url('user_autocomplete_data'),
- minChars:2,
- maxHeight:400,
- deferRequestBy: 300, //miliseconds
- showNoSuggestionNotice: true,
- tabDisabled: true,
- autoSelectFirst: true,
- params: { user_id: templateContext.rhodecode_user.user_id, user_groups:true, user_groups_expand:true, skip_default_user:true },
- formatResult: autocompleteFormatResult,
- lookupFilter: autocompleteFilterResult,
- onSelect: function(element, data) {
+var autoCompleteHandler = function (inputId, controller, role) {
+
+ return function (element, data) {
var mandatory = false;
- var reasons = [_gettext('added manually by "{0}"').format(templateContext.rhodecode_user.username)];
+ var reasons = [_gettext('added manually by "{0}"').format(
+ templateContext.rhodecode_user.username)];
// add whole user groups
if (data.value_type == 'user_group') {
reasons.push(_gettext('member of "{0}"').format(data.value_display));
- $.each(data.members, function(index, member_data) {
+ $.each(data.members, function (index, member_data) {
var reviewer = member_data;
reviewer['user_id'] = member_data['id'];
reviewer['gravatar_link'] = member_data['icon_link'];
reviewer['user_link'] = member_data['profile_link'];
reviewer['rules'] = [];
- reviewersController.addReviewMember(reviewer, reasons, mandatory);
+ controller.addMember(reviewer, reasons, mandatory, role);
})
}
// add single user
@@ -487,14 +562,71 @@ var ReviewerAutoComplete = function(inpu
reviewer['gravatar_link'] = data['icon_link'];
reviewer['user_link'] = data['profile_link'];
reviewer['rules'] = [];
- reviewersController.addReviewMember(reviewer, reasons, mandatory);
+ controller.addMember(reviewer, reasons, mandatory, role);
}
- $(inputId).val('');
+ $(inputId).val('');
}
- });
+}
+
+/**
+ * Reviewer autocomplete
+ */
+var ReviewerAutoComplete = function (inputId, controller) {
+ var self = this;
+ self.controller = controller;
+ self.inputId = inputId;
+ var handler = autoCompleteHandler(inputId, controller, controller.ROLE_REVIEWER);
+
+ $(inputId).autocomplete({
+ serviceUrl: pyroutes.url('user_autocomplete_data'),
+ minChars: 2,
+ maxHeight: 400,
+ deferRequestBy: 300, //miliseconds
+ showNoSuggestionNotice: true,
+ tabDisabled: true,
+ autoSelectFirst: true,
+ params: {
+ user_id: templateContext.rhodecode_user.user_id,
+ user_groups: true,
+ user_groups_expand: true,
+ skip_default_user: true
+ },
+ formatResult: autocompleteFormatResult,
+ lookupFilter: autocompleteFilterResult,
+ onSelect: handler
+ });
};
+/**
+ * Observers autocomplete
+ */
+var ObserverAutoComplete = function(inputId, controller) {
+ var self = this;
+ self.controller = controller;
+ self.inputId = inputId;
+ var handler = autoCompleteHandler(inputId, controller, controller.ROLE_OBSERVER);
+
+ $(inputId).autocomplete({
+ serviceUrl: pyroutes.url('user_autocomplete_data'),
+ minChars: 2,
+ maxHeight: 400,
+ deferRequestBy: 300, //miliseconds
+ showNoSuggestionNotice: true,
+ tabDisabled: true,
+ autoSelectFirst: true,
+ params: {
+ user_id: templateContext.rhodecode_user.user_id,
+ user_groups: true,
+ user_groups_expand: true,
+ skip_default_user: true
+ },
+ formatResult: autocompleteFormatResult,
+ lookupFilter: autocompleteFilterResult,
+ onSelect: handler
+ });
+}
+
window.VersionController = function () {
var self = this;
@@ -504,7 +636,7 @@ window.VersionController = function () {
this.adjustRadioSelectors = function (curNode) {
var getVal = function (item) {
- if (item == 'latest') {
+ if (item === 'latest') {
return Number.MAX_SAFE_INTEGER
}
else {
@@ -663,6 +795,7 @@ window.UpdatePrController = function ()
};
};
+
/**
* Reviewer display panel
*/
@@ -702,26 +835,37 @@ window.ReviewersPanel = {
},
renderReviewers: function () {
+ if (this.setReviewers.reviewers === undefined) {
+ return
+ }
+ if (this.setReviewers.reviewers.length === 0) {
+ reviewersController.emptyReviewersTable('No reviewers No observers
+ !
+
% endif
- ## NEW, since refresh
- % if existing_ids and comment_obj.comment_id not in existing_ids:
- NEW
- % endif
+ <%
+ data = h.json.dumps({
+ 'comment_id': comment_obj.comment_id,
+ 'version_info': version_info,
+ 'file_name': comment_obj.f_path,
+ 'line_no': comment_obj.line_no,
+ 'outdated': comment_obj.outdated,
+ 'inline': comment_obj.is_inline,
+ 'is_todo': comment_obj.is_todo,
+ 'created_on': h.format_date(comment_obj.created_on),
+ 'datetime': '{}{}'.format(comment_obj.created_on, h.get_timezone(comment_obj.created_on, time_is_local=True)),
+ 'review_status': (comment_obj.review_status or '')
+ })
+
+ if comment_obj.outdated:
+ icon = 'icon-comment-toggle'
+ elif comment_obj.is_inline:
+ icon = 'icon-code'
+ else:
+ icon = 'icon-comment'
+ %>
+
+
+
diff --git a/rhodecode/templates/changeset/changeset.mako b/rhodecode/templates/changeset/changeset.mako
--- a/rhodecode/templates/changeset/changeset.mako
+++ b/rhodecode/templates/changeset/changeset.mako
@@ -187,12 +187,12 @@
diff --git a/rhodecode/templates/debug_style/collapsable-content.html b/rhodecode/templates/debug_style/collapsable-content.html
--- a/rhodecode/templates/debug_style/collapsable-content.html
+++ b/rhodecode/templates/debug_style/collapsable-content.html
@@ -149,7 +149,7 @@
jenkins-tests (reviewer)