Changeset - 014c9a58a0d9
Parent rev.
Child rev.
[Not reviewed]
beta
0 4 0
Marcin Kuzminski - 15 years ago 2011-03-24 16:35:53
marcin@python-works.com
fixes for issues #137 and #116 safe_unicode is now default for handling file names
4 files changed with 18 insertions and 18 deletions:
rhodecode/lib/helpers.py
3
3
rhodecode/templates/changeset/changeset.html
7
7
rhodecode/templates/changeset/changeset_range.html
7
7
rhodecode/templates/files/files_browser.html
1
1
0 comments (0 inline, 0 general)
rhodecode/lib/helpers.py
➞
Show inline comments
 
@@ -33,13 +33,13 @@ from webhelpers.date import time_ago_in_
 
from webhelpers.paginate import Page
 
from webhelpers.html.tags import _set_input_attrs, _set_id_attr, \
 
    convert_boolean_attrs, NotGiven
 

			




	
	
	
		
 
from vcs.utils.annotate import annotate_highlight

			




	
	
	
		
 
from rhodecode.lib.utils import repo_name_slug

			




	
	
	
		
 
from rhodecode.lib import str2bool

			




	
	
	
		
 
from rhodecode.lib import str2bool, safe_unicode

			




	
	
	
		
 

			




	
	
	
		
 
def _reset(name, value=None, id=NotGiven, type="reset", **attrs):

			




	
	
	
		
 
    """

			




	
	
	
		
 
    Reset button

			




	
	
	
		
 
    """

			




	
	
	
		
 
    _set_input_attrs(attrs, type, name, value)

			




	
	
		
 
@@ -189,13 +189,13 @@ class _ToolTip(object):

			




	
	
	
		
 
tooltip = _ToolTip()

			




	
	
	
		
 

			




	
	
	
		
 
class _FilesBreadCrumbs(object):

			




	
	
	
		
 

			




	
	
	
		
 
    def __call__(self, repo_name, rev, paths):

			




	
	
	
		
 
        if isinstance(paths, str):

			




	
	
	
		
 
            paths = paths.decode('utf-8', 'replace')

			




	
	
	
		
 
            paths = safe_unicode(paths)

			




	
	
	
		
 
        url_l = [link_to(repo_name, url('files_home',

			




	
	
	
		
 
                                        repo_name=repo_name,

			




	
	
	
		
 
                                        revision=rev, f_path=''))]

			




	
	
	
		
 
        paths_l = paths.split('/')

			




	
	
	
		
 
        for cnt, p in enumerate(paths_l):

			




	
	
	
		
 
            if p != '':

			




	
	
		
 
@@ -677,13 +677,13 @@ class RepoPage(Page):

			




	
	
	
		
 
def changed_tooltip(nodes):

			




	
	
	
		
 
    if nodes:

			




	
	
	
		
 
        pref = ': <br/> '

			




	
	
	
		
 
        suf = ''

			




	
	
	
		
 
        if len(nodes) > 30:

			




	
	
	
		
 
            suf = '<br/>' + _(' and %s more') % (len(nodes) - 30)

			




	
	
	
		
 
        return literal(pref + '<br/> '.join([x.path.decode('utf-8', 'replace') for x in nodes[:30]]) + suf)

			




	
	
	
		
 
        return literal(pref + '<br/> '.join([safe_unicode(x.path) for x in nodes[:30]]) + suf)

			




	
	
	
		
 
    else:

			




	
	
	
		
 
        return ': ' + _('No Files')

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
def repo_link(groups_and_repos):

			




        

    


    
    

    

        

                

                    rhodecode/templates/changeset/changeset.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -86,13 +86,13 @@

			




	
	
	
		
 
		         </span>                                                                 

			




	
	
	
		
 
	                </div>              

			




	
	
	
		
 
	        </div>

			




	
	
	
		
 
	        <span style="font-size:1.1em;font-weight: bold">${_('Files affected (%s)' % len(c.changeset.affected_files))}</span>

			




	
	
	
		
 
	        <div class="cs_files">

			




	
	
	
		
 
	                %for change,filenode,diff,cs1,cs2 in c.changes:

			




	
	
	
		
 
	                    <div class="cs_${change}">${h.link_to(filenode.path.decode('utf-8','replace'),h.url.current(anchor=h.repo_name_slug('C%s' % filenode.path.decode('utf-8','replace'))))}</div>

			




	
	
	
		
 
	                    <div class="cs_${change}">${h.link_to(h.safe_unicode(filenode.path),h.url.current(anchor=h.repo_name_slug('C%s' % h.safe_unicode(filenode.path))))}</div>

			




	
	
	
		
 
	                %endfor

			




	
	
	
		
 
	                % if c.cut_off:

			




	
	
	
		
 
	                  ${_('Changeset was to big and was cut off...')}

			




	
	
	
		
 
	                % endif

			




	
	
	
		
 
	        </div>         

			




	
	
	
		
 
	    </div>

			




	
	
		
 
@@ -100,25 +100,25 @@

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    	

			




	
	
	
		
 
	%for change,filenode,diff,cs1,cs2 in c.changes:

			




	
	
	
		
 
		%if change !='removed':

			




	
	
	
		
 
		<div style="clear:both;height:10px"></div>

			




	
	
	
		
 
		<div class="diffblock">

			




	
	
	
		
 
			<div id="${h.repo_name_slug('C%s' % filenode.path.decode('utf-8','replace'))}" class="code-header">

			




	
	
	
		
 
			<div id="${h.repo_name_slug('C%s' % h.safe_unicode(filenode.path))}" class="code-header">

			




	
	
	
		
 
				<div class="changeset_header">

			




	
	
	
		
 
					<span class="changeset_file">

			




	
	
	
		
 
						${h.link_to_if(change!='removed',filenode.path.decode('utf-8','replace'),h.url('files_home',repo_name=c.repo_name,

			




	
	
	
		
 
						revision=filenode.changeset.raw_id,f_path=filenode.path.decode('utf-8','replace')))}

			




	
	
	
		
 
						${h.link_to_if(change!='removed',h.safe_unicode(filenode.path),h.url('files_home',repo_name=c.repo_name,

			




	
	
	
		
 
						revision=filenode.changeset.raw_id,f_path=h.safe_unicode(filenode.path)))}

			




	
	
	
		
 
					</span>

			




	
	
	
		
 
					%if 1:

			




	
	
	
		
 
					&raquo; <span>${h.link_to(_('diff'),

			




	
	
	
		
 
					h.url('files_diff_home',repo_name=c.repo_name,f_path=filenode.path.decode('utf-8','replace'),diff2=cs2,diff1=cs1,diff='diff'))}</span>

			




	
	
	
		
 
					h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(filenode.path),diff2=cs2,diff1=cs1,diff='diff'))}</span>

			




	
	
	
		
 
					&raquo; <span>${h.link_to(_('raw diff'),

			




	
	
	
		
 
					h.url('files_diff_home',repo_name=c.repo_name,f_path=filenode.path.decode('utf-8','replace'),diff2=cs2,diff1=cs1,diff='raw'))}</span>

			




	
	
	
		
 
					h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(filenode.path),diff2=cs2,diff1=cs1,diff='raw'))}</span>

			




	
	
	
		
 
					&raquo; <span>${h.link_to(_('download diff'),

			




	
	
	
		
 
					h.url('files_diff_home',repo_name=c.repo_name,f_path=filenode.path.decode('utf-8','replace'),diff2=cs2,diff1=cs1,diff='download'))}</span>

			




	
	
	
		
 
					h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(filenode.path),diff2=cs2,diff1=cs1,diff='download'))}</span>

			




	
	
	
		
 
					%endif

			




	
	
	
		
 
				</div>

			




	
	
	
		
 
			</div>

			




	
	
	
		
 
			<div class="code-body">        

			




	
	
	
		
 
					%if diff:

			




	
	
	
		
 
						${diff|n}

			




        

    


    
    

    

        

                

                    rhodecode/templates/changeset/changeset_range.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -51,37 +51,37 @@

			




	
	
	
		
 
	        </div>

			




	
	
	
		
 
	        <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">${_('Files affected')}</div>

			




	
	
	
		
 
	        <div class="cs_files">

			




	
	
	
		
 
	               %for cs in c.cs_ranges:

			




	
	
	
		
 
	                   <div class="cur_cs">r${cs}</div>

			




	
	
	
		
 
	                %for change,filenode,diff,cs1,cs2 in c.changes[cs.raw_id]:

			




	
	
	
		
 
	                    <div class="cs_${change}">${h.link_to(filenode.path.decode('utf-8','replace'),h.url.current(anchor=h.repo_name_slug('C%s-%s' % (cs.short_id,filenode.path.decode('utf-8','replace')))))}</div>

			




	
	
	
		
 
	                    <div class="cs_${change}">${h.link_to(h.safe_unicode(filenode.path),h.url.current(anchor=h.repo_name_slug('C%s-%s' % (cs.short_id,h.safe_unicode(filenode.path)))))}</div>

			




	
	
	
		
 
	                %endfor

			




	
	
	
		
 
	               %endfor 

			




	
	
	
		
 
	        </div>         

			




	
	
	
		
 
	    </div>

			




	
	
	
		
 
	    

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
   %for cs in c.cs_ranges:    	

			




	
	
	
		
 
	%for change,filenode,diff,cs1,cs2 in c.changes[cs.raw_id]:

			




	
	
	
		
 
		%if change !='removed':

			




	
	
	
		
 
		<div style="clear:both;height:10px"></div>

			




	
	
	
		
 
		<div class="diffblock">

			




	
	
	
		
 
			<div id="${h.repo_name_slug('C%s-%s' % (cs.short_id,filenode.path.decode('utf-8','replace')))}" class="code-header">

			




	
	
	
		
 
			<div id="${h.repo_name_slug('C%s-%s' % (cs.short_id,h.safe_unicode(filenode.path)))}" class="code-header">

			




	
	
	
		
 
				<div class="changeset_header">

			




	
	
	
		
 
					<span class="changeset_file">

			




	
	
	
		
 
						${h.link_to_if(change!='removed',filenode.path.decode('utf-8','replace'),h.url('files_home',repo_name=c.repo_name,

			




	
	
	
		
 
						revision=filenode.changeset.raw_id,f_path=filenode.path.decode('utf-8','replace')))}

			




	
	
	
		
 
						${h.link_to_if(change!='removed',h.safe_unicode(filenode.path,h.url('files_home',repo_name=c.repo_name,

			




	
	
	
		
 
						revision=filenode.changeset.raw_id,f_path=h.safe_unicode(filenode.path)))}

			




	
	
	
		
 
					</span>

			




	
	
	
		
 
					%if 1:

			




	
	
	
		
 
					&raquo; <span>${h.link_to(_('diff'),

			




	
	
	
		
 
					h.url('files_diff_home',repo_name=c.repo_name,f_path=filenode.path.decode('utf-8','replace'),diff2=cs2,diff1=cs1,diff='diff'))}</span>

			




	
	
	
		
 
					h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(filenode.path),diff2=cs2,diff1=cs1,diff='diff'))}</span>

			




	
	
	
		
 
					&raquo; <span>${h.link_to(_('raw diff'),

			




	
	
	
		
 
					h.url('files_diff_home',repo_name=c.repo_name,f_path=filenode.path.decode('utf-8','replace'),diff2=cs2,diff1=cs1,diff='raw'))}</span>

			




	
	
	
		
 
					h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(filenode.path),diff2=cs2,diff1=cs1,diff='raw'))}</span>

			




	
	
	
		
 
					&raquo; <span>${h.link_to(_('download diff'),

			




	
	
	
		
 
					h.url('files_diff_home',repo_name=c.repo_name,f_path=filenode.path.decode('utf-8','replace'),diff2=cs2,diff1=cs1,diff='download'))}</span>

			




	
	
	
		
 
					h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(filenode.path),diff2=cs2,diff1=cs1,diff='download'))}</span>

			




	
	
	
		
 
					%endif

			




	
	
	
		
 
				</div>

			




	
	
	
		
 
			</div>

			




	
	
	
		
 
			<div class="code-body">        

			




	
	
	
		
 
					%if diff:

			




	
	
	
		
 
						${diff|n}

			




        

    


    
    

    

        

                

                    rhodecode/templates/files/files_browser.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -63,13 +63,13 @@

			




	
	
	
		
 
				</tr>

			




	
	
	
		
 
          		%endif

			




	
	
	
		
 
		         	

			




	
	
	
		
 
		    %for cnt,node in enumerate(c.files_list):

			




	
	
	
		
 
				<tr class="parity${cnt%2}">

			




	
	
	
		
 
		             <td>

			




	
	
	
		
 
						${h.link_to(node.name,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=node.path.decode('utf-8','replace')),class_=file_class(node))}

			




	
	
	
		
 
						${h.link_to(node.name,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=h.safe_unicode(node.path)),class_=file_class(node))}

			




	
	
	
		
 
		             </td>

			




	
	
	
		
 
		             <td>

			




	
	
	
		
 
		             %if node.is_file():

			




	
	
	
		
 
		             	${h.format_byte_size(node.size,binary=True)}

			




	
	
	
		
 
		             %endif	

			




	
	
	
		
 
		             </td>

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        Server instance: clio-21792
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.
            – Support