kallithea Changeset - ad3573d744ef

Changeset - ad3573d744ef

Parent rev.

Child rev.

[Not reviewed]

beta

0 2 0

Marcin Kuzminski - 13 years ago 2012-07-15 19:17:00
marcin@python-works.com

added option to remove members added using autocomplete widget from pull
request

2 files changed with 17 insertions and 8 deletions:

rhodecode/public/js/rhodecode.js

rhodecode/templates/pullrequests/pullrequest.html

0 comments (0 inline, 0 general)

rhodecode/public/js/rhodecode.js

➞

Show inline comments

@@ @@ -619,24 +619,30 @@ var renderInlineComments = function(file @@
         var comments = box.children;
         for(var i=0; i<comments.length; i++){
         	var data = {
         		'rendered_text': comments[i].outerHTML,
         		'line_no': YUD.getAttribute(comments[i],'line'),
         		'target_id': target_id
+        	}
         	renderInlineComment(data);
+        }
+    }
+}
 var removeReviewer = function(reviewer_id){
 	var el = YUD.get('reviewer_{0}'.format(reviewer_id));
 	if (el.parentNode !== undefined){
 		el.parentNode.removeChild(el);
+	}
+}
 var fileBrowserListeners = function(current_url, node_list_url, url_base){
 	var current_url_branch = +"?branch=__BRANCH__";
 	var url = url_base;
 	var node_url = node_list_url;
 	YUE.on('stay_at_branch','click',function(e){
 	    if(e.target.checked){
 	        var uri = current_url_branch;
 	        uri = uri.replace('__BRANCH__',e.target.value);
 	        window.location = uri;
@@ @@ -1372,36 +1378,38 @@ var PullRequestAutoComplete = function ( @@
             var myAC = aArgs[0]; // reference back to the AC instance
             var elLI = aArgs[1]; // reference to the selected LI element
             var oData = aArgs[2]; // object literal of selected item's result data
             var members  = YUD.get('review_members');
             //fill the autocomplete with value
             if (oData.nname != undefined) {
             	if (myAC.dataSource.cache.indexOf(oData.id) != -1){
             		return
+            	}
             	var tmpl = '<li>'+
+            	var tmpl = '<li id="reviewer_{2}">'+
 		                      '<div class="reviewers_member">'+
 		                        '<div class="gravatar"><img alt="gravatar" src="{0}"/> </div>'+
 		                        '<div style="float:left">{1}</div>'+
 		                        '<input type="hidden" value="{2}" name="review_members" />'+
 		                        '<span class="delete_icon action_button" onclick="removeReviewer({2})"></span>'+
 		                      '</div>'+
 		                   '</li>'
 		        var displayname = "{0} {1} ({2})".format(oData.fname,oData.lname,oData.nname);
             	var element = tmpl.format(oData.gravatar_lnk,displayname,oData.id);
             	members.innerHTML += element;
             	myAC.dataSource.cache.push(oData.id);
             	YUD.get('user').value = ''
+            }
     	});
+    }
     return {
         ownerDS: ownerDS,
         reviewerAC: reviewerAC,
     };
+}
 /**
  * QUICK REPO MENU

rhodecode/templates/pullrequests/pullrequest.html

➞

Show inline comments

@@ @@ -64,31 +64,32 @@ @@
        <div style="float:left" id="pull_request_overview"></div>
        <div style="float:left;clear:both;padding:10px 10px 10px 0px;display:none">
             <a id="pull_request_overview_url" href="#">${_('Detailed compare view')}</a>
        </div>
      </div>
     <div style="float:left; border-left:1px dashed #eee">
         <h4>${_('Pull request reviewers')}</h4>
         <div id="reviewers" style="padding:0px 0px 0px 15px">
           ## members goes here !
           <div class="group_members_wrap">
             <ul id="review_members" class="group_members">
             %for member in c.review_members:
                   <li>
                     <div class="reviewers_member">
                       <div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(member.email,14)}"/> </div>
                       <div style="float:left">${member.full_name} (${_('owner')})</div>
                       <input type="hidden" value="${member.user_id}" name="review_members" />
                     </div>
                  </li>
               <li id="reviewer_${member.user_id}">
                 <div class="reviewers_member">
                   <div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(member.email,14)}"/> </div>
                   <div style="float:left">${member.full_name} (${_('owner')})</div>
                   <input type="hidden" value="${member.user_id}" name="review_members" />
                   <span class="delete_icon action_button" onclick="removeReviewer(${member.user_id})"></span>
                 </div>
               </li>
             %endfor
             </ul>
           </div>
           <div class='ac'>
             <div class="reviewer_ac">
                ${h.text('user', class_='yui-ac-input')}
                <span class="help-block">${_('Add reviewer to this pull request.')}</span>
                <div id="reviewers_container"></div>
             </div>
           </div>
         </div>

0 comments (0 inline, 0 general)