diff options
| -rw-r--r-- | rhodecode/controllers/changeset.py | 5 | ||||
| -rw-r--r-- | rhodecode/controllers/pullrequests.py | 12 | ||||
| -rw-r--r-- | rhodecode/model/comment.py | 153 | ||||
| -rw-r--r-- | rhodecode/model/notification.py | 16 | ||||
| -rw-r--r-- | rhodecode/model/pull_request.py | 15 | ||||
| -rw-r--r-- | rhodecode/templates/email_templates/changeset_comment.html | 21 | ||||
| -rw-r--r-- | rhodecode/templates/email_templates/pull_request.html | 10 | ||||
| -rw-r--r-- | rhodecode/templates/email_templates/pull_request_comment.html | 15 | ||||
| -rw-r--r-- | rhodecode/templates/pullrequests/pullrequest.html | 4 |
9 files changed, 153 insertions, 98 deletions
diff --git a/rhodecode/controllers/changeset.py b/rhodecode/controllers/changeset.py index f982f04f..a3a588da 100644 --- a/rhodecode/controllers/changeset.py +++ b/rhodecode/controllers/changeset.py @@ -329,7 +329,7 @@ class ChangesetController(BaseRepoController): text = text or (_('Status change -> %s') % ChangesetStatus.get_status_lbl(status)) - comm = ChangesetCommentsModel().create( + c.co = comm = ChangesetCommentsModel().create( text=text, repo=c.rhodecode_db_repo.repo_id, user=c.rhodecode_user.user_id, @@ -371,12 +371,11 @@ class ChangesetController(BaseRepoController): if not request.environ.get('HTTP_X_PARTIAL_XHR'): return redirect(h.url('changeset_home', repo_name=repo_name, revision=revision)) - + #only ajax below data = { 'target_id': h.safeid(h.safe_unicode(request.POST.get('f_path'))), } if comm: - c.co = comm data.update(comm.get_dict()) data.update({'rendered_text': render('changeset/changeset_comment_block.html')}) diff --git a/rhodecode/controllers/pullrequests.py b/rhodecode/controllers/pullrequests.py index d196fedb..9f2d0b24 100644 --- a/rhodecode/controllers/pullrequests.py +++ b/rhodecode/controllers/pullrequests.py @@ -403,11 +403,15 @@ class PullrequestsController(BaseRepoController): status = request.POST.get('changeset_status') change_status = request.POST.get('change_changeset_status') text = request.POST.get('text') + close_pr = request.POST.get('save_close') allowed_to_change_status = self._get_is_allowed_change_status(pull_request) if status and change_status and allowed_to_change_status: - text = text or (_('Status change -> %s') + _def = (_('status change -> %s') % ChangesetStatus.get_status_lbl(status)) + if close_pr: + _def = _('Closing with') + ' ' + _def + text = text or _def comm = ChangesetCommentsModel().create( text=text, repo=c.rhodecode_db_repo.repo_id, @@ -416,7 +420,9 @@ class PullrequestsController(BaseRepoController): f_path=request.POST.get('f_path'), line_no=request.POST.get('line'), status_change=(ChangesetStatus.get_status_lbl(status) - if status and change_status and allowed_to_change_status else None) + if status and change_status + and allowed_to_change_status else None), + closing_pr=close_pr ) action_logger(self.rhodecode_user, @@ -434,7 +440,7 @@ class PullrequestsController(BaseRepoController): pull_request=pull_request_id ) - if request.POST.get('save_close'): + if close_pr: if status in ['rejected', 'approved']: PullRequestModel().close_pull_request(pull_request_id) action_logger(self.rhodecode_user, diff --git a/rhodecode/model/comment.py b/rhodecode/model/comment.py index 0bf1b40b..ed814180 100644 --- a/rhodecode/model/comment.py +++ b/rhodecode/model/comment.py @@ -35,6 +35,7 @@ from rhodecode.model import BaseModel from rhodecode.model.db import ChangesetComment, User, Repository, \ Notification, PullRequest from rhodecode.model.notification import NotificationModel +from rhodecode.model.meta import Session log = logging.getLogger(__name__) @@ -57,67 +58,41 @@ class ChangesetCommentsModel(BaseModel): user_objects.append(user_obj) return user_objects - def create(self, text, repo, user, revision=None, pull_request=None, - f_path=None, line_no=None, status_change=None, send_email=True): + def _get_notification_data(self, repo, comment, user, comment_text, + line_no=None, revision=None, pull_request=None, + status_change=None, closing_pr=False): """ - Creates new comment for changeset or pull request. - IF status_change is not none this comment is associated with a - status change of changeset or changesets associated with pull request + Get notification data - :param text: - :param repo: - :param user: - :param revision: - :param pull_request: - :param f_path: - :param line_no: - :param status_change: - :param send_email: + :param comment_text: + :param line: + :returns: tuple (subj,body,recipients,notification_type,email_kwargs) """ - if not text: - return - - repo = self._get_repo(repo) - user = self._get_user(user) - comment = ChangesetComment() - comment.repo = repo - comment.author = user - comment.text = text - comment.f_path = f_path - comment.line_no = line_no - - if revision: - cs = repo.scm_instance.get_changeset(revision) - desc = "%s - %s" % (cs.short_id, h.shorter(cs.message, 256)) - comment.revision = revision - elif pull_request: - pull_request = self.__get_pull_request(pull_request) - comment.pull_request = pull_request - else: - raise Exception('Please specify revision or pull_request_id') - - self.sa.add(comment) - self.sa.flush() - # make notification + body = comment_text # text of the comment line = '' - body = text + if line_no: + line = _('on line %s') % line_no #changeset if revision: - if line_no: - line = _('on line %s') % line_no + notification_type = Notification.TYPE_CHANGESET_COMMENT + cs = repo.scm_instance.get_changeset(revision) + desc = "%s" % (cs.short_id) + + _url = h.url('changeset_home', + repo_name=repo.repo_name, + revision=revision, + anchor='comment-%s' % comment.comment_id, + qualified=True, + ) subj = safe_unicode( - h.link_to('Re commit: %(desc)s %(line)s' % \ + h.link_to('Re changeset: %(desc)s %(line)s' % \ {'desc': desc, 'line': line}, - h.url('changeset_home', repo_name=repo.repo_name, - revision=revision, - anchor='comment-%s' % comment.comment_id, - qualified=True, - ) - ) + _url) ) - notification_type = Notification.TYPE_CHANGESET_COMMENT + email_subject = 'User %s commented on changeset %s' % \ + (user.username, h.short_id(revision)) # get the current participants of this changeset recipients = ChangesetComment.get_users(revision=revision) # add changeset author if it's in rhodecode system @@ -128,9 +103,17 @@ class ChangesetCommentsModel(BaseModel): recipients += [cs_author] email_kwargs = { 'status_change': status_change, + 'cs_comment_user': h.person(user.email), + 'cs_target_repo': h.url('summary_home', repo_name=repo.repo_name, + qualified=True), + 'cs_comment_url': _url, + 'raw_id': revision, + 'message': cs.message } #pull request elif pull_request: + notification_type = Notification.TYPE_PULL_REQUEST_COMMENT + desc = comment.pull_request.title _url = h.url('pullrequest_show', repo_name=pull_request.other_repo.repo_name, pull_request_id=pull_request.pull_request_id, @@ -139,13 +122,13 @@ class ChangesetCommentsModel(BaseModel): ) subj = safe_unicode( h.link_to('Re pull request #%(pr_id)s: %(desc)s %(line)s' % \ - {'desc': comment.pull_request.title, + {'desc': desc, 'pr_id': comment.pull_request.pull_request_id, 'line': line}, _url) ) - - notification_type = Notification.TYPE_PULL_REQUEST_COMMENT + email_subject = 'User %s commented on pull request #%s' % \ + (user.username, comment.pull_request.pull_request_id) # get the current participants of this pull request recipients = ChangesetComment.get_users(pull_request_id= pull_request.pull_request_id) @@ -159,6 +142,7 @@ class ChangesetCommentsModel(BaseModel): email_kwargs = { 'pr_id': pull_request.pull_request_id, 'status_change': status_change, + 'closing_pr': closing_pr, 'pr_comment_url': _url, 'pr_comment_user': h.person(user.email), 'pr_target_repo': h.url('summary_home', @@ -166,12 +150,66 @@ class ChangesetCommentsModel(BaseModel): qualified=True) } + return subj, body, recipients, notification_type, email_kwargs, email_subject + + def create(self, text, repo, user, revision=None, pull_request=None, + f_path=None, line_no=None, status_change=None, closing_pr=False, + send_email=True): + """ + Creates new comment for changeset or pull request. + IF status_change is not none this comment is associated with a + status change of changeset or changesets associated with pull request + + :param text: + :param repo: + :param user: + :param revision: + :param pull_request: + :param f_path: + :param line_no: + :param status_change: + :param closing_pr: + :param send_email: + """ + if not text: + log.warning('Missing text for comment, skipping...') + return + + repo = self._get_repo(repo) + user = self._get_user(user) + comment = ChangesetComment() + comment.repo = repo + comment.author = user + comment.text = text + comment.f_path = f_path + comment.line_no = line_no + + if revision: + comment.revision = revision + elif pull_request: + pull_request = self.__get_pull_request(pull_request) + comment.pull_request = pull_request + else: + raise Exception('Please specify revision or pull_request_id') + + Session().add(comment) + Session().flush() + if send_email: + (subj, body, recipients, notification_type, + email_kwargs, email_subject) = self._get_notification_data( + repo, comment, user, + comment_text=text, + line_no=line_no, + revision=revision, + pull_request=pull_request, + status_change=status_change, + closing_pr=closing_pr) # create notification objects, and emails NotificationModel().create( created_by=user, subject=subj, body=body, recipients=recipients, type_=notification_type, - email_kwargs=email_kwargs + email_kwargs=email_kwargs, email_subject=email_subject ) mention_recipients = set(self._extract_mentions(body))\ @@ -195,7 +233,7 @@ class ChangesetCommentsModel(BaseModel): :param comment_id: """ comment = self.__get_changeset_comment(comment) - self.sa.delete(comment) + Session().delete(comment) return comment @@ -204,11 +242,8 @@ class ChangesetCommentsModel(BaseModel): Get's main comments based on revision or pull_request_id :param repo_id: - :type repo_id: :param revision: - :type revision: :param pull_request: - :type pull_request: """ q = ChangesetComment.query()\ @@ -226,7 +261,7 @@ class ChangesetCommentsModel(BaseModel): return q.all() def get_inline_comments(self, repo_id, revision=None, pull_request=None): - q = self.sa.query(ChangesetComment)\ + q = Session().query(ChangesetComment)\ .filter(ChangesetComment.repo_id == repo_id)\ .filter(ChangesetComment.line_no != None)\ .filter(ChangesetComment.f_path != None)\ diff --git a/rhodecode/model/notification.py b/rhodecode/model/notification.py index 1fe0f0cb..4cabfc53 100644 --- a/rhodecode/model/notification.py +++ b/rhodecode/model/notification.py @@ -35,6 +35,7 @@ import rhodecode from rhodecode.lib import helpers as h from rhodecode.model import BaseModel from rhodecode.model.db import Notification, User, UserNotification +from rhodecode.model.meta import Session log = logging.getLogger(__name__) @@ -55,7 +56,7 @@ class NotificationModel(BaseModel): def create(self, created_by, subject, body, recipients=None, type_=Notification.TYPE_MESSAGE, with_email=True, - email_kwargs={}): + email_kwargs={}, email_subject=None): """ Creates notification of given type @@ -69,6 +70,7 @@ class NotificationModel(BaseModel): :param type_: type of notification :param with_email: send email with this notification :param email_kwargs: additional dict to pass as args to email template + :param email_subject: use given subject as email subject """ from rhodecode.lib.celerylib import tasks, run_task @@ -106,7 +108,8 @@ class NotificationModel(BaseModel): # send email with notification to all other participants for rec in rec_objs: - email_subject = NotificationModel().make_description(notif, False) + if not email_subject: + email_subject = NotificationModel().make_description(notif, show_age=False) type_ = type_ email_body = body ## this is passed into template @@ -131,7 +134,7 @@ class NotificationModel(BaseModel): .filter(UserNotification.notification == notification)\ .one() - self.sa.delete(obj) + Session().delete(obj) return True except Exception: log.error(traceback.format_exc()) @@ -142,7 +145,6 @@ class NotificationModel(BaseModel): Get mentions for given user, filter them if filter dict is given :param user: - :type user: :param filter: """ user = self._get_user(user) @@ -168,7 +170,7 @@ class NotificationModel(BaseModel): == notification)\ .one() obj.read = True - self.sa.add(obj) + Session().add(obj) return True except Exception: log.error(traceback.format_exc()) @@ -188,7 +190,7 @@ class NotificationModel(BaseModel): # update on joined tables :( for obj in q.all(): obj.read = True - self.sa.add(obj) + Session().add(obj) def get_unread_cnt_for_user(self, user): user = self._get_user(user) @@ -218,7 +220,7 @@ class NotificationModel(BaseModel): #alias _n = notification _map = { - _n.TYPE_CHANGESET_COMMENT: _('commented on commit at %(when)s'), + _n.TYPE_CHANGESET_COMMENT: _('commented on changeset at %(when)s'), _n.TYPE_MESSAGE: _('sent message at %(when)s'), _n.TYPE_MENTION: _('mentioned you at %(when)s'), _n.TYPE_REGISTRATION: _('registered in RhodeCode at %(when)s'), diff --git a/rhodecode/model/pull_request.py b/rhodecode/model/pull_request.py index ab2e1082..6f831337 100644 --- a/rhodecode/model/pull_request.py +++ b/rhodecode/model/pull_request.py @@ -75,13 +75,13 @@ class PullRequestModel(BaseModel): new.title = title new.description = description new.author = created_by_user - self.sa.add(new) + Session().add(new) Session().flush() #members for member in set(reviewers): _usr = self._get_user(member) reviewer = PullRequestReviewers(_usr, new) - self.sa.add(reviewer) + Session().add(reviewer) #reset state to under-review ChangesetStatusModel().set_status( @@ -90,7 +90,8 @@ class PullRequestModel(BaseModel): user=created_by_user, pull_request=new ) - + revision_data = [(x.raw_id, x.message) + for x in map(org_repo.get_changeset, revisions)] #notification to reviewers notif = NotificationModel() @@ -114,7 +115,7 @@ class PullRequestModel(BaseModel): 'pr_repo_url': h.url('summary_home', repo_name=other_repo.repo_name, qualified=True,), 'pr_url': pr_url, - 'pr_revisions': revisions + 'pr_revisions': revision_data } notif.create(created_by=created_by_user, subject=subject, body=body, @@ -140,7 +141,7 @@ class PullRequestModel(BaseModel): for uid in to_add: _usr = self._get_user(uid) reviewer = PullRequestReviewers(_usr, pull_request) - self.sa.add(reviewer) + Session().add(reviewer) for uid in to_remove: reviewer = PullRequestReviewers.query()\ @@ -148,7 +149,7 @@ class PullRequestModel(BaseModel): PullRequestReviewers.pull_request==pull_request)\ .scalar() if reviewer: - self.sa.delete(reviewer) + Session().delete(reviewer) def delete(self, pull_request): pull_request = self.__get_pull_request(pull_request) @@ -158,7 +159,7 @@ class PullRequestModel(BaseModel): pull_request = self.__get_pull_request(pull_request) pull_request.status = PullRequest.STATUS_CLOSED pull_request.updated_on = datetime.datetime.now() - self.sa.add(pull_request) + Session().add(pull_request) def _get_changesets(self, alias, org_repo, org_ref, other_repo, other_ref): """ diff --git a/rhodecode/templates/email_templates/changeset_comment.html b/rhodecode/templates/email_templates/changeset_comment.html index ca4c9f67..618cdce5 100644 --- a/rhodecode/templates/email_templates/changeset_comment.html +++ b/rhodecode/templates/email_templates/changeset_comment.html @@ -1,12 +1,17 @@ ## -*- coding: utf-8 -*- <%inherit file="main.html"/> - -<h4>${subject}</h4> - +##message from user goes here +<p> +${cs_comment_user}: <br/> ${body} +</p> +%if status_change: + <span>${_('New status')} -> ${status_change}</span> +%endif +<div>${_('View this comment here')}: ${cs_comment_url}</div> -% if status_change is not None: -<div> - ${_('New status')} -> ${status_change} -</div> -% endif +<pre> +${_('Repo')}: ${cs_target_repo} +${_('Changeset')}: ${h.short_id(raw_id)} +${_('desc')}: ${h.shorter(message, 256)} +</pre> diff --git a/rhodecode/templates/email_templates/pull_request.html b/rhodecode/templates/email_templates/pull_request.html index 780092d3..a302bb51 100644 --- a/rhodecode/templates/email_templates/pull_request.html +++ b/rhodecode/templates/email_templates/pull_request.html @@ -10,8 +10,10 @@ ${body} </p> <div>${_('revisions for reviewing')}</div> -<ul> -%for r in pr_revisions: - <li>${r}</li> +<pre> +%for r,r_msg in pr_revisions: +${h.short_id(r)}: + ${h.shorter(r_msg, 256)} + %endfor -</ul> +</pre> diff --git a/rhodecode/templates/email_templates/pull_request_comment.html b/rhodecode/templates/email_templates/pull_request_comment.html index 0efe3736..af780002 100644 --- a/rhodecode/templates/email_templates/pull_request_comment.html +++ b/rhodecode/templates/email_templates/pull_request_comment.html @@ -1,13 +1,18 @@ ## -*- coding: utf-8 -*- <%inherit file="main.html"/> - -${_('User %s commented on pull request #%s for repository %s') % ('<b>%s</b>' % pr_comment_user, pr_id, pr_target_repo) |n} -<div>${_('View this comment here')}: ${pr_comment_url}</div> - +${_('Pull request #%s for repository %s') % (pr_id, pr_target_repo) |n} +##message from user goes here <p> +${pr_comment_user}: <br/> ${body} +</p> +<div>${_('View this comment here')}: ${pr_comment_url}</div> %if status_change: - <span>${_('New status')} -> ${status_change}</span> + %if closing_pr: + <span>${_('Closing pull request with status')} -> ${status_change}</span> + %else: + <span>${_('New status')} -> ${status_change}</span> + %endif %endif </p> diff --git a/rhodecode/templates/pullrequests/pullrequest.html b/rhodecode/templates/pullrequests/pullrequest.html index f60c2ad4..2195ce60 100644 --- a/rhodecode/templates/pullrequests/pullrequest.html +++ b/rhodecode/templates/pullrequests/pullrequest.html @@ -30,7 +30,7 @@ <span style="font-size: 20px"> ${h.select('org_repo','',c.org_repos,class_='refs')}:${h.select('org_ref',c.default_org_ref,c.org_refs,class_='refs')} </span> - <div style="padding:5px 3px 3px 42px;">${c.rhodecode_db_repo.description}</div> + <div style="padding:5px 3px 3px 20px;">${c.rhodecode_db_repo.description}</div> </div> <div style="clear:both;padding-top: 10px"></div> </div> @@ -44,7 +44,7 @@ <span style="font-size: 20px"> ${h.select('other_repo',c.default_other_repo,c.other_repos,class_='refs')}:${h.select('other_ref',c.default_other_ref,c.default_other_refs,class_='refs')} </span> - <div id="other_repo_desc" style="padding:5px 3px 3px 42px;"></div> + <div id="other_repo_desc" style="padding:5px 3px 3px 20px;"></div> </div> <div style="clear:both;padding-top: 10px"></div> </div> |