##// END OF EJS Templates
pull-requests: added WIP markers in display, and improved a bit ui when creating a pull-request....
marcink -
r4102:24c7dd99 default
parent child Browse files
Show More
@@ -682,7 +682,8 b' class MyAccountView(BaseAppView, DataGri'
682 682 'target_repo': _render('pullrequest_target_repo',
683 683 pr.target_repo.repo_name),
684 684 'name': _render('pullrequest_name',
685 pr.pull_request_id, pr.target_repo.repo_name,
685 pr.pull_request_id, pr.work_in_progress,
686 pr.target_repo.repo_name,
686 687 short=True),
687 688 'name_raw': pr.pull_request_id,
688 689 'status': _render('pullrequest_status',
@@ -108,7 +108,8 b' class RepoPullRequestsView(RepoAppView, '
108 108
109 109 data.append({
110 110 'name': _render('pullrequest_name',
111 pr.pull_request_id, pr.target_repo.repo_name),
111 pr.pull_request_id, pr.work_in_progress,
112 pr.target_repo.repo_name),
112 113 'name_raw': pr.pull_request_id,
113 114 'status': _render('pullrequest_status',
114 115 pr.calculated_review_status()),
@@ -370,8 +370,12 b''
370 370 <i class="icon-comment"></i> ${comments_nr}
371 371 </%def>
372 372
373 <%def name="pullrequest_name(pull_request_id, target_repo_name, short=False)">
373 <%def name="pullrequest_name(pull_request_id, is_wip, target_repo_name, short=False)">
374 374 <a href="${h.route_path('pullrequest_show',repo_name=target_repo_name,pull_request_id=pull_request_id)}">
375 % if is_wip:
376 <span class="tag tooltip" title="${_('Work in progress')}">wip</span>
377 % endif
378
375 379 % if short:
376 380 !${pull_request_id}
377 381 % else:
@@ -40,13 +40,16 b''
40 40 <div class="input">
41 41 ${h.text('pullrequest_title', c.default_title, class_="medium autogenerated-title")}
42 42 </div>
43 <p class="help-block">
44 Start the title with WIP: to prevent accidental merge of Work In Progress pull request before it's ready.
45 </p>
43 46 </div>
44 47
45 48 <div class="field">
46 49 <div class="label label-textarea">
47 50 <label for="pullrequest_desc">${_('Description')}:</label>
48 51 </div>
49 <div class="textarea text-area editor">
52 <div class="textarea text-area">
50 53 <input id="pr-renderer-input" type="hidden" name="description_renderer" value="${c.visual.default_renderer}">
51 54 ${dt.markup_form('pullrequest_desc')}
52 55 </div>
General Comments 0
You need to be logged in to leave comments. Login now