zaihui
/
educoder
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_huang 

# Conflicts:
#	app/views/shixuns/_achieve_ways.html.erb
This commit is contained in:
miss 2017-09-30 19:42:18 +08:00
parent d46088baf0 1fd9f3a9dd
commit 87401900d3
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/views/shixuns/_achieve_ways.html.erb
View File

@ -7,12 +7,17 @@
<div class="task_popup_con">
<div class="newupload_conbox clearfix">
<ul style = "height:200px;overflow-y:hidden;background:#f5f5f5; padding:10px;">
<%= to_path_param(@path) %>
<% if @dir.present? %>
<% @dir.each do |entry| %>
<li class = "entry">
<div class="filename_no_report hidden">
<%= link_to h(entry[1]), search_file_list_shixun_path(@shixun, :path => to_path_param(entry[1])), :class => (entry[0] == "tree" ? 'old-icon old-icon-folder' : 'old-icon old-icon-file'), :remote => true %>
<% if entry[0] == "tree" %>
<%= link_to h(entry[1]), search_file_list_shixun_path(@shixun, :path => to_path_param(entry[1])), :class => 'old-icon old-icon-folder', :remote => true %>
<% else %>
<a href="javascript:void(0);" class="old-icon old-icon-file"><%= h(entry[1]) %></a>
<% end %>
</div>
</li>
<% end %>