代码格式

dev_hjq
huang 10 years ago
parent 9464495c19
commit b4617e431f

@ -117,7 +117,7 @@
</div>
<div class="cl"></div>
</div>
<div id="course_list">
<div id="course_list">
<%= render :partial => 'project_list',:locals => {project: @project, all_attachments: @all_attachments, sort:@sort, order:@order, project_attachments:@obj_attachments} %>
</div>
</div>

@ -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%>
<!-- 全站搜索的时候 返回的页码对象是obj_pages,而站内搜索返回的页码对象是feedback_pages -->
<%=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" %>

@ -1,8 +1,9 @@
<% if project && tag_list && tag_list.empty? == false%>
<% if project && tag_list && tag_list.empty? == false %>
<span class="files_tag_icon" >
<a title=""
onclick="search_tag_attachment('<%= search_tag_attachment_project_files_path(project)%>','','<%= @q%>','<%= project.id%>');"
>全部</a></span>
<a title="" onclick="search_tag_attachment('<%= search_tag_attachment_project_files_path(project)%>','','<%= @q%>','<%= project.id%>');">
全部
</a>
</span>
<% end %>
<% unless tag_list.nil?%>
<% tag_list.each do |k,v|%>

Loading…
Cancel
Save