Merge branch 'master' of http://repository.trustie.net/xianbo/trustie2

app/helpers/bids_helper.rb

@@ -145,6 +145,17 @@ module BidsHelper
     people.include?(User.current)
   end
 
+  # 当前用户是否加入了此课程（包括教师）
+  def is_cur_course_user? bid
+    people = []
+    #people << bid.author
+    course = bid.courses.first
+    course.members.each do |member|
+      people <<  member.user
+    end
+    people.include?(User.current)
+  end
+
   # def select_option_helper option
     # tmp = Hash.new
     # option.each do |project|

app/views/bids/_homework_list.html.erb

@@ -44,7 +44,7 @@
                         <% end %>
                       </td>
                       <td style="vertical-align: top">
-                        <% if display_id %>
+                        <% if is_cur_course_user? @bid %>
                             <%= link_to "互评>>" , homework_attach_path(homework)%>
                         <% end %>
                       </td>

app/views/homework_attach/_showjour.html.erb

@@ -71,3 +71,11 @@
       <% end %>
     </ul>
 <% end %>
+
+
+<!--分页-->
+<div class="pagination" style="float:left;">
+  <ul>
+    <%= pagination_links_full @feedback_pages %>
+  </ul>
+</div>

app/views/homework_attach/show.html.erb

@@ -145,12 +145,5 @@
   <%= render :partial => 'showjour', :locals => {:jour => @jour} %>
 </div>
 
-<!--分页-->
-<div class="pagination" style="float:left;">
-  <ul>
-    <%= pagination_links_full @feedback_pages %>
-  </ul>
-</div>
-
 <div>
 </div>