kallithea Changeset - b9c9216d6fa7

Changeset - b9c9216d6fa7

Parent rev.

Child rev.

[Not reviewed]

default

0 4 0

Mads Kiilerich - 10 years ago 2015-08-26 17:28:59
madski@unity3d.com

pull requests: make owner editable with auto completion

4 files changed with 15 insertions and 4 deletions:

kallithea/controllers/pullrequests.py

kallithea/model/forms.py

kallithea/templates/pullrequests/pullrequest_show.html

kallithea/tests/functional/test_pullrequests.py

0 comments (0 inline, 0 general)

kallithea/controllers/pullrequests.py

➞

Show inline comments

@@ @@ -58,12 +58,13 @@ from kallithea.model.comment import Chan @@
 from kallithea.model.changeset_status import ChangesetStatusModel
 from kallithea.model.forms import PullRequestForm, PullRequestPostForm
 from kallithea.lib.utils2 import safe_int
 from kallithea.controllers.changeset import _ignorews_url, _context_url
 from kallithea.controllers.compare import CompareController
 from kallithea.lib.graphmod import graph_data
 from kallithea.model.db import User ### FIXME
 log = logging.getLogger(__name__)
 class PullrequestsController(BaseRepoController):
@@ @@ -494,12 +495,13 @@ class PullrequestsController(BaseRepoCon @@
                                       _form['pullrequest_desc'],
                                       reviewers_ids)
         old_description = pull_request.description
         pull_request.title = _form['pullrequest_title']
         pull_request.description = _form['pullrequest_desc'].strip() or _('No description')
         pull_request.owner = User.get_by_username(_form['owner'])
         try:
             PullRequestModel().mention_from_description(pull_request, old_description)
             PullRequestModel().update_reviewers(pull_request_id, reviewers_ids)
         except UserInvalidException as u:
             h.flash(_('Invalid reviewer "%s" specified') % u, category='error')
             raise HTTPBadRequest()

kallithea/model/forms.py

➞

Show inline comments

@@ @@ -515,12 +515,14 @@ def PullRequestPostForm(): @@
         filter_extra_fields = True
         pullrequest_title = v.UnicodeString(strip=True, required=True)
         pullrequest_desc = v.UnicodeString(strip=True, required=False)
         review_members = v.Set()
         updaterev = v.UnicodeString(strip=True, required=False, if_missing=None)
         owner = All(v.UnicodeString(strip=True, required=True),
                     v.ValidRepoUser())
     return _PullRequestPostForm
 def GistForm(lifetime_options):
     class _GistForm(formencode.Schema):

kallithea/templates/pullrequests/pullrequest_show.html

➞

Show inline comments

@@ @@ -35,23 +35,23 @@ ${self.repo_context_bar('showpullrequest @@
         <div class="field pr-not-edit" style="min-height:37px">
           <div class="label-summary">
             <label>${_('Description')}:</label>
             %if editable:
             <div style="margin: 5px">
-              <a class="btn btn-small" onclick="$('#pr-edit-form').show();$('.pr-not-edit').hide()">${_("Edit")}</a>
+              <a class="btn btn-small" onclick="$('.pr-do-edit').show();$('.pr-not-edit').hide()">${_("Edit")}</a>
             </div>
             %endif
           </div>
           <div class="input">
             <div style="white-space:pre-wrap; line-height: 14px">${h.urlify_commit(c.pull_request.description, c.pull_request.org_repo.repo_name)}</div>
           </div>
         </div>
         %if editable:
-        <div id="pr-edit-form" style="display:none">
+        <div class="pr-do-edit" style="display:none">
           <div class="field">
               <div class="label-summary">
                   <label for="pullrequest_title">${_('Title')}:</label>
               </div>
               <div class="input">
                   ${h.text('pullrequest_title',class_="large",value=c.pull_request.title,placeholder=_('Summarize the changes'))}
@@ @@ -150,19 +150,23 @@ ${self.repo_context_bar('showpullrequest @@
           </div>
         </div>
         <div class="field">
           <div class="label-summary">
               <label>${_('Owner')}:</label>
           </div>
           <div class="input">
+          <div class="input pr-not-edit">
                   <div class="gravatar">
                     ${h.gravatar(c.pull_request.owner.email, size=20)}
                   </div>
                   <span>${c.pull_request.owner.full_name_and_username}</span><br/>
                   <span><a href="mailto:${c.pull_request.owner.email}">${c.pull_request.owner.email}</a></span><br/>
           </div>
           <div class="input pr-do-edit ac" style="display:none">
                ${h.text('owner', class_="large", value=c.pull_request.owner.username, placeholder=_('Username'))}
                <div id="owner_completion_container"></div>
           </div>
         </div>
         <div class="field">
             <div class="label-summary">
               <label>${_('Update')}:</label>
             </div>
@@ @@ -370,12 +374,13 @@ ${self.repo_context_bar('showpullrequest @@
                        c.current_voting_result,
                        is_pr=True, change_status=c.allowed_to_change_status)}
     <script type="text/javascript">
       $(document).ready(function(){
           PullRequestAutoComplete($('#user'), $('#reviewers_container'), _USERS_AC_DATA);
           SimpleUserAutoComplete($('#owner'), $('#owner_completion_container'), _USERS_AC_DATA);
           $('.code-difftable').on('click', '.add-bubble', function(e){
               show_comment_form($(this));
           });
           var avail_jsdata = ${c.avail_jsdata|n};
@@ @@ -388,13 +393,13 @@ ${self.repo_context_bar('showpullrequest @@
               var update = !!e.target.value;
               $('#pr-form-save').prop('disabled',update);
               $('#pr-form-clone').prop('disabled',!update);
           });
           var $org_review_members = $('#review_members').clone();
           $('#pr-form-reset').click(function(e){
-              $('#pr-edit-form').hide();
+              $('.pr-do-edit').hide();
               $('.pr-not-edit').show();
               $('#pr-form-save').prop('disabled',false);
               $('#pr-form-clone').prop('disabled',true);
               $('#review_members').html($org_review_members);
           });

kallithea/tests/functional/test_pullrequests.py

➞

Show inline comments

@@ @@ -97,12 +97,13 @@ class TestPullrequestsController(TestCon @@
         response = self.app.post(url(controller='pullrequests', action='post',
                                      repo_name=HG_REPO, pull_request_id=pull_request_id),
+                                 {
                                   'updaterev': 'default',
                                   'pullrequest_title': 'title',
                                   'pullrequest_desc': 'description',
                                   'owner': TEST_USER_ADMIN_LOGIN,
                                   '_authentication_token': self.authentication_token(),
                                   'review_members': invalid_user_id,
                                  },
                                  status=400)
         response.mustcontain('Invalid reviewer &#34;%s&#34; specified' % invalid_user_id)
@@ @@ -132,12 +133,13 @@ class TestPullrequestsController(TestCon @@
         # edit it
         response = self.app.post(url(controller='pullrequests', action='post',
                                      repo_name=HG_REPO, pull_request_id=pull_request_id),
+                                 {
                                   'pullrequest_title': 'title',
                                   'pullrequest_desc': 'description',
                                   'owner': TEST_USER_ADMIN_LOGIN,
                                   '_authentication_token': self.authentication_token(),
                                   'review_members': invalid_user_id,
                                  },
                                  status=400)
         response.mustcontain('Invalid reviewer &#34;%s&#34; specified' % invalid_user_id)

0 comments (0 inline, 0 general)