kallithea Changeset - 82ec506f7378

Changeset - 82ec506f7378

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Mads Kiilerich - 10 years ago 2016-02-01 21:22:39
madski@unity3d.com

pullrequests: try to improve usability of PR update functionality

2 files changed with 3 insertions and 2 deletions:

kallithea/controllers/pullrequests.py

kallithea/templates/pullrequests/pullrequest_show.html

0 comments (0 inline, 0 general)

kallithea/controllers/pullrequests.py

➞

Show inline comments

@@ @@ -611,7 +611,7 @@ class PullrequestsController(BaseRepoCon @@
                         hgrepo = org_scm_instance._repo
                     show = set(hgrepo.revs('::%ld & !::parents(%s) & !::%s',
                                            avail_revs, revs[0], targethead))
-                    c.update_msg = _('This pull request can be updated with changes on %s:') % c.cs_branch_name
+                    c.update_msg = _('The following changes are available on %s:') % c.cs_branch_name
                 else:
                     show = set()
                     avail_revs = set() # drop revs[0]

kallithea/templates/pullrequests/pullrequest_show.html

➞

Show inline comments

@@ @@ -202,6 +202,7 @@ ${self.repo_context_bar('showpullrequest @@
                   %endfor
                 </table>
               </div>
               <div class="msg-div">${_("Pull requests do not change once created. Select a revision and save to replace this pull request with a new one.")}</div>
               %endif
               <div class="msg-div">${c.update_msg_other}</div>
             </div>
@@ @@ -282,7 +283,7 @@ ${self.repo_context_bar('showpullrequest @@
         %if editable:
           <div class="buttons">
             ${h.submit('pr-form-save',_('Save Changes'),class_="btn btn-small")}
             ${h.submit('pr-form-clone',_('Save as New Pull Request'),class_="btn btn-small",disabled='disabled')}
+            ${h.submit('pr-form-clone',_('Save Updates as New Pull Request'),class_="btn btn-small",disabled='disabled')}
             ${h.reset('pr-form-reset',_('Cancel Changes'),class_="btn btn-small")}
           </div>
         %endif

0 comments (0 inline, 0 general)