deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1438 from SaitoWu/bugfix/1434

Browse source 
tree view need use ascii-8bit, file name need be utf8.
This commit is contained in:
Dmitriy Zaporozhets 2012-09-11 05:43:56 -07:00
parent 9fb595eb35 96d4f22e53
commit 4903910390
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/helpers/tree_helper.rb
View file

@ -18,7 +18,8 @@ module TreeHelper
end end
def tree_full_path(content) def tree_full_path(content)
if params[:path] content.name.force_encoding('utf-8')
if params[:path]
File.join(params[:path], content.name) File.join(params[:path], content.name)
else else
content.name content.name

2
app/models/tree.rb
View file

@ -16,7 +16,7 @@ class Tree
def initialize(raw_tree, project, ref = nil, path = nil) def initialize(raw_tree, project, ref = nil, path = nil)
@project, @ref, @path = project, ref, path, @project, @ref, @path = project, ref, path,
@tree = if path @tree = if path
raw_tree / path raw_tree / path.dup.force_encoding('ascii-8bit')
else else
raw_tree raw_tree
end end

2
app/views/refs/_tree_file.html.haml
View file

@ -2,7 +2,7 @@
.file_title .file_title
%i.icon-file %i.icon-file
%span.file_name %span.file_name
= name = name.force_encoding('utf-8')
%small #{file.mode} %small #{file.mode}
%span.options %span.options
= link_to "raw", blob_project_ref_path(@project, @ref, path: params[:path]), class: "btn very_small", target: "_blank" = link_to "raw", blob_project_ref_path(@project, @ref, path: params[:path]), class: "btn very_small", target: "_blank"