diff --git a/app/views/files/_project_file.html.erb b/app/views/files/_project_file.html.erb index cd2bd1327..c0b239cd3 100644 --- a/app/views/files/_project_file.html.erb +++ b/app/views/files/_project_file.html.erb @@ -117,7 +117,7 @@
-
+
<%= render :partial => 'project_list',:locals => {project: @project, all_attachments: @all_attachments, sort:@sort, order:@order, project_attachments:@obj_attachments} %>
diff --git a/app/views/files/_project_list.html.erb b/app/views/files/_project_list.html.erb index 8f50148c6..217f48ef7 100644 --- a/app/views/files/_project_list.html.erb +++ b/app/views/files/_project_list.html.erb @@ -47,7 +47,7 @@ <% if project_attachments.count == 10%> <% if params[:action] == 'search' %> - <%=link_to "点击展开更多", search_project_project_files_path({:project_id => project.id,:page => @obj_pages.nil? ? @feedback_pages.page + 1 : @obj_pages.page + 1}.merge(params)),:id => "show_more_attachments",:remote => "true",:class => "loadMore mt10 f_grey" %> + <%=link_to "点击展开更多", search_project_project_files_path({:project_id => project.id, :page => @obj_pages.nil? ? @feedback_pages.page + 1 : @obj_pages.page + 1}.merge(params)),:id => "show_more_attachments",:remote => "true",:class => "loadMore mt10 f_grey" %> <%else%> <%=link_to "列表点击展开更多", project_files_path({:project_id => project.id, :page => @obj_pages.nil? ? @feedback_pages.page + 1 : @obj_pages.page + 1}.merge(params)),:id => "show_more_attachments",:remote => "true",:class => "loadMore mt10 f_grey" %> diff --git a/app/views/files/_tag_yun_project.html.erb b/app/views/files/_tag_yun_project.html.erb index 5be0baa1e..6bf7064b7 100644 --- a/app/views/files/_tag_yun_project.html.erb +++ b/app/views/files/_tag_yun_project.html.erb @@ -1,8 +1,9 @@ -<% if project && tag_list && tag_list.empty? == false%> +<% if project && tag_list && tag_list.empty? == false %> - 全部 + + 全部 + + <% end %> <% unless tag_list.nil?%> <% tag_list.each do |k,v|%>