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

@@ @@ -361,32 +361,37 @@ class ChangesetController(BaseRepoContro @@
     @jsonify
     def comment(self, repo_name, revision):
         comm = ChangesetCommentsModel().create(
             text=request.POST.get('text'),
             repo_id=c.rhodecode_db_repo.repo_id,
             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
         if h.HasPermissionAny('hg.admin', 'repository.admin')() or owner:
             ChangesetCommentsModel().delete(comment=co)
             Session.commit()
             return True
         else:
             raise HTTPForbidden()

rhodecode/public/js/rhodecode.js

➞

Show inline comments

@@ @@ -187,24 +187,27 @@ function ypjax(url,container,s_call,f_ca @@
 		success:s_wrapper,
 		failure:function(o){
 			console.log(o);
 			YUD.get(container).innerHTML='ERROR';
 			YUD.setStyle(container,'opacity','1.0');
 			YUD.setStyle(container,'color','red');
+		}
 	},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) {
 	        _qs.push(encodeURIComponent(_p) + '=' + encodeURIComponent(o[_p]));
+	    }
 	    return _qs.join('&');
 	};
     var sUrl = url;
@@ @@ -414,24 +417,28 @@ var injectInlineForm = function(tr){ @@
 	            'line':lineno
 		  };
 		  if(lineno === undefined){
 			  alert('missing line !');
 			  return
+		  }
 		  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);
 		  };
 		  if (YUD.hasClass(overlay,'overlay')){
 			  var w = _form.offsetWidth;
 			  var h = _form.offsetHeight;
 			  YUD.setStyle(overlay,'width',w+'px');
 			  YUD.setStyle(overlay,'height',h+'px');
@@ @@ -444,25 +451,25 @@ var injectInlineForm = function(tr){ @@
 	  tooltip_activate();
 };
 var deleteComment = function(comment_id){
 	var url = AJAX_COMMENT_DELETE_URL.replace('__COMMENT_ID__',comment_id);
     var postData = {'_method':'delete'};
     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){
 	var label = TRANSLATION_MAP['add another comment'];
 	var html_el = document.createElement('div');
 	YUD.addClass(html_el, 'add-comment');
 	html_el.innerHTML = '<span class="ui-btn">{0}</span>'.format(label);

rhodecode/templates/changeset/changeset_file_comment.html

➞

Show inline comments

@@ @@ -78,25 +78,27 @@ @@
     %endfor
 </%def>
 <%def name="comments(changeset)">
 <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">
             <div class="comment-help">
                 ${_('Comments parsed using')} <a href="${h.url('rst_help')}">RST</a> ${_('syntax')}
                 ${_('with')} <span style="color:#003367" class="tooltip" title="${_('Use @username inside this text to send notification to this RhodeCode user')}">@mention</span> ${_('support')}
             </div>
                 ${h.textarea('text')}
         </div>

0 comments (0 inline, 0 general)