kallithea Changeset - 06c4ff173b5b

Changeset - 06c4ff173b5b

Parent rev.

Child rev.

[Not reviewed]

Merge default

0 5 0

Mads Kiilerich - 10 years ago 2015-06-06 17:41:27
madski@unity3d.com

Merge stable

5 files changed with 14 insertions and 5 deletions:

kallithea/lib/vcs/backends/git/repository.py

kallithea/model/repo.py

kallithea/public/js/base.js

kallithea/templates/files/files_browser.html

kallithea/templates/summary/summary.html

0 comments (0 inline, 0 general)

kallithea/lib/vcs/backends/git/repository.py

➞

Show inline comments

@@ @@ -15,12 +15,18 @@ import time @@
 import errno
 import urllib
 import urllib2
 import logging
 import posixpath
 import string
 import sys
 if sys.platform == "win32":
     from subprocess import list2cmdline
     def quote(s):
         return list2cmdline([s])
 else:
 try:
     # Python <=2.7
     from pipes import quote
 except ImportError:
     # Python 3.3+
     from shlex import quote

kallithea/model/repo.py

➞

Show inline comments

@@ @@ -207,15 +207,15 @@ class RepoModel(BaseModel): @@
             return _render('revision', repo_name, cs_cache.get('revision'),
                            cs_cache.get('raw_id'), cs_cache.get('author'),
                            cs_cache.get('message'))
         def desc(desc):
             if c.visual.stylify_metatags:
-                return h.urlify_text(h.desc_stylize(h.escape(h.truncate(desc, 60))))
+                return h.urlify_text(h.desc_stylize(h.html_escape(h.truncate(desc, 60))))
             else:
-                return h.urlify_text(h.escape(h.truncate(desc, 60)))
+                return h.urlify_text(h.html_escape(h.truncate(desc, 60)))
         def state(repo_state):
             return _render("repo_state", repo_state)
         def repo_actions(repo_name):
             return _render('repo_actions', repo_name, super_user_actions)

kallithea/public/js/base.js

➞

Show inline comments

@@ @@ -732,12 +732,15 @@ var injectInlineForm = function(tr){ @@
 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 $deleted = $('#comment-tr-'+comment_id);
         var $prev = $deleted.prev('tr');
         while ($prev.hasClass('inline-comments')){
             $prev = $prev.prev('tr');
+        }
         $deleted.remove();
         _placeAddButton($prev);
+    }
     ajaxPOST(url,postData,success);
+}

kallithea/templates/files/files_browser.html

➞

Show inline comments

@@ @@ -87,13 +87,13 @@ @@
                      %if node.is_file():
                          ${h.format_byte_size(node.size,binary=True)}
                      %endif
                      </td>
                      <td>
                          %if node.is_file():
                              <a title="${h.tooltip(node.last_changeset.message)}" href="${h.url('changeset_home',repo_name=c.repo_name,revision=node.last_changeset)}" class="tooltip revision-link">${h.show_id(node.last_changeset)}</a>
+                             <a title="${h.tooltip(node.last_changeset.message)}" href="${h.url('changeset_home',repo_name=c.repo_name,revision=node.last_changeset.raw_id)}" class="tooltip revision-link">${h.show_id(node.last_changeset)}</a>
                          %endif
                      </td>
                      <td>
                          %if node.is_file():
                              <span class="tooltip" title="${h.tooltip(h.fmt_date(node.last_changeset.date))}">
                             ${h.age(node.last_changeset.date)}</span>

kallithea/templates/summary/summary.html

➞

Show inline comments

@@ @@ -82,15 +82,15 @@ summary = lambda n:{False:'summary-short @@
             <div class="field">
               <div class="label-summary">
                   <label>${_('Description')}:</label>
               </div>
                  %if c.visual.stylify_metatags:
-                   <div class="input ${summary(c.show_stats)} desc">${h.urlify_text(h.desc_stylize(h.escape(c.db_repo.description)))}</div>
+                   <div class="input ${summary(c.show_stats)} desc">${h.urlify_text(h.desc_stylize(h.html_escape(c.db_repo.description)))}</div>
                  %else:
-                   <div class="input ${summary(c.show_stats)} desc">${h.urlify_text(h.escape(c.db_repo.description))}</div>
+                   <div class="input ${summary(c.show_stats)} desc">${h.urlify_text(h.html_escape(c.db_repo.description))}</div>
                  %endif
             </div>
             <div class="field">
               <div class="label-summary">
                   <label>${_('Trending files')}:</label>

0 comments (0 inline, 0 general)