kallithea Changeset - 3052f90c568a

Changeset - 3052f90c568a

Parent rev.

Child rev.

[Not reviewed]

beta

0 3 0

Marcin Kuzminski - 14 years ago 2012-04-14 22:40:47
marcin@python-works.com

fixed main comments, prevent from sending inline comments if text is empty

3 files changed with 16 insertions and 2 deletions:

rhodecode/controllers/changeset.py

rhodecode/public/js/rhodecode.js

rhodecode/templates/changeset/changeset_file_comment.html

0 comments (0 inline, 0 general)

rhodecode/controllers/changeset.py

➞

Show inline comments

@@ @@ -367,20 +367,25 @@ class ChangesetController(BaseRepoContro @@
             user_id=c.rhodecode_user.user_id,
             revision=revision,
             f_path=request.POST.get('f_path'),
             line_no=request.POST.get('line')
+        )
         Session.commit()
         if not request.environ.get('HTTP_X_PARTIAL_XHR'):
             return redirect(h.url('changeset_home', repo_name=repo_name,
                                   revision=revision))
         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')})
         return data
     @jsonify
     def delete_comment(self, repo_name, comment_id):
         co = ChangesetComment.get(comment_id)
         owner = lambda: co.author.user_id == c.rhodecode_user.user_id

rhodecode/public/js/rhodecode.js

➞

Show inline comments

@@ @@ -193,12 +193,15 @@ function ypjax(url,container,s_call,f_ca @@
+		}
 	},args);
 };
 var ajaxPOST = function(url,postData,success) {
 	// Set special header for ajax == HTTP_X_PARTIAL_XHR
 	YUC.initHeader('X-PARTIAL-XHR',true);
 	var toQueryString = function(o) {
 	    if(typeof o !== 'object') {
 	        return false;
+	    }
 	    var _p, _qs = [];
 	    for(_p in o) {
@@ @@ -420,12 +423,16 @@ var injectInlineForm = function(tr){ @@
+		  }
 		  if(f_path === undefined){
 			  alert('missing file path !');
 			  return
+		  }
 		  if(text == ""){
 			  return
+		  }
 		  var success = function(o){
 			  YUD.removeClass(tr, 'form-open');
 			  removeInlineForm(f);
 			  var json_data = JSON.parse(o.responseText);
 	          renderInlineComment(json_data);
 		  };
@@ @@ -450,13 +457,13 @@ var deleteComment = function(comment_id) @@
     var success = function(o){
         var n = YUD.get('comment-tr-'+comment_id);
         var root = n.previousElementSibling.previousElementSibling;
         n.parentNode.removeChild(n);
         // scann nodes, and attach add button to last one
-        placeAddButton(root);
         placeAddButton(root);
+    }
     ajaxPOST(url,postData,success);
+}
 var createInlineAddButton = function(tr){

rhodecode/templates/changeset/changeset_file_comment.html

➞

Show inline comments

@@ @@ -84,13 +84,15 @@ @@
 <div class="comments">
     <div id="inline-comments-container">
      ${inlines(changeset)}
     </div>
     %for co in c.comments:
         ${comment_block(co)}
         <div id="comment-tr-${co.comment_id}">
           ${comment_block(co)}
         </div>
     %endfor
     %if c.rhodecode_user.username != 'default':
     <div class="comment-form">
         ${h.form(h.url('changeset_comment', repo_name=c.repo_name, revision=changeset.raw_id))}
         <strong>${_('Leave a comment')}</strong>
         <div class="clearfix">

0 comments (0 inline, 0 general)