Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh

app/controllers/issues_controller.rb

@@ -81,7 +81,8 @@ class IssuesController < ApplicationController
       @status_id = params[:status_id]
       @subject = params[:subject]
       @issue_count = @query.issue_count
-      @issue_pages = Paginator.new @issue_count, @limit, params['page'].to_i + 1
+      @issue_pages = Paginator.new @issue_count, @limit, params['page']
+      params[:page] = (params[:page] || 1).to_i + 1 #页码需要加1
       @offset ||= @issue_pages.offset
       @issues = @query.issues(:include => [:assigned_to, :tracker, :priority, :category, :fixed_version],
                               :order => sort_clause,

app/views/issues/_list.html.erb

@@ -40,14 +40,14 @@
      <%= render :partial => 'users/project_issue', :locals => {:activity => issue, :user_activity_id => issue.id} %>
  <% end %>
  <% if issues.count == 10%>
-     <!--<div id="show_more_issues" class="loadMore mt10 f_grey">点击展开更多<%#=link_to "",  project_issues_path({:project_id => project.id,:page => issue_pages.page}.merge(params)),:id => "more_issues_link",:remote => "true",:class => "none" %></div>-->
+     <div id="show_more_issues" class="loadMore mt10 f_grey">展开更多<%=link_to "",  project_issues_path({:project_id => project.id}.merge(params)),:id => "more_issues_link",:remote => "true",:class => "none" %></div>
-     <%= link_to "点击展开更多",project_issues_path({:project_id => project.id,:page => issue_pages.page}.merge(params)),:id => "show_more_issues",:remote => "true",:class => "loadMore mt10 f_grey"%>
+     <%#= link_to "点击展开更多",user_activities_path(@user.id,:type => type,:page => page),:id => "show_more_activities",:remote => "true",:class => "loadMore mt10 f_grey"%>
  <% end%>
  <!--<ul class="wlist">-->
    <!--<%#= pagination_links_full issue_pages, issue_count, :per_page_links => false, :remote => true, :flag => true %>-->
  <!--</ul>-->
- <!--<script type="text/javascript">
+ <script type="text/javascript">
      $("#show_more_issues").mouseover(function(){
          $("#more_issues_link").click();
      });
- </script>-->
+ </script>

app/views/student_work/_revise_attachment.html.erb

@@ -9,7 +9,7 @@
           <%= render :partial => 'work_attachments_status', :locals => {:attachments => work.attachments.where("attachtype = 7"), :status => 2} %>
           <span class="tit_fb">追加时间：</span><%=format_time revise_attachment.created_on.to_s %>&nbsp;&nbsp;(<%=revise_attachment_status @homework,revise_attachment %>)<br />
           <% unless revise_attachment.description == "" %>
-            <span class="tit_fb">附件描述：</span><p class="showHworkP"><%=revise_attachment.description %></p>
+            <span class="tit_fb">追加理由：</span><p class="showHworkP"><%=revise_attachment.description %></p>
           <% end %>
         </div>
         <div class="cl"></div>
@@ -24,7 +24,7 @@
               <%= render :partial => 'work_attachments_status', :locals => {:attachments => work.attachments.where("attachtype = 7"), :status => 1} %>
               <span class="tit_fb">追加时间：</span><%=format_time revise_attachment.created_on.to_s %><br />
               <% unless revise_attachment.description == "" %>
-                  <span class="tit_fb">附件描述：</span><p class="showHworkP"><%=revise_attachment.description %></p>
+                  <span class="tit_fb">追加理由：</span><p class="showHworkP"><%=revise_attachment.description %></p>
               <% end %>
             </div>
         <% end %>