From 914117230e58325be4847678500b80fb046caa63 Mon Sep 17 00:00:00 2001
From: linchun <sxszwlc@sina.cn>
Date: Thu, 31 Mar 2016 15:15:11 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=91=98=E7=95=8C=E9=9D=A2=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=8A=A5500=E9=94=99=E8=AF=AF=E7=9A=84bug=EF=BC=8C=EF=BC=8C?=
 =?UTF-8?q?=E5=88=86=E9=A1=B5=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/admin/users.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/admin/users.html.erb b/app/views/admin/users.html.erb
index 2a757fdee..89eb1276e 100644
--- a/app/views/admin/users.html.erb
+++ b/app/views/admin/users.html.erb
@@ -68,7 +68,7 @@
     </div>
     <div class="pagination">
       <ul>
-        <%= pagination_links_full @user_pages, @user_count %>
+        <%= pagination_links_full @user_pages, @user_count, :per_page_links => false %>
         </ul>
     </div>
 

From 2af261056ca6650f2d13214e43347e04474e2c96 Mon Sep 17 00:00:00 2001
From: linchun <sxszwlc@sina.cn>
Date: Thu, 31 Mar 2016 15:33:48 +0800
Subject: [PATCH 2/4] =?UTF-8?q?h=E5=9B=9E=E5=A4=8D=E6=94=B9=E8=BF=87?=
 =?UTF-8?q?=E7=9A=84=E5=88=86=E9=A1=B5=E9=94=99=E8=AF=AF=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=9C=89=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/admin/users.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/admin/users.html.erb b/app/views/admin/users.html.erb
index 89eb1276e..2a757fdee 100644
--- a/app/views/admin/users.html.erb
+++ b/app/views/admin/users.html.erb
@@ -68,7 +68,7 @@
     </div>
     <div class="pagination">
       <ul>
-        <%= pagination_links_full @user_pages, @user_count, :per_page_links => false %>
+        <%= pagination_links_full @user_pages, @user_count %>
         </ul>
     </div>
 

From c1c19f6d609dc58a70e20ad46a4104191f652ad0 Mon Sep 17 00:00:00 2001
From: linchun <sxszwlc@sina.cn>
Date: Fri, 1 Apr 2016 15:54:59 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=91=98=E7=95=8C=E9=9D=A2=E4=BD=9C=E4=B8=9A=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=8A=A5500=E9=94=99=E8=AF=AF=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/admin/homework.html.erb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/views/admin/homework.html.erb b/app/views/admin/homework.html.erb
index 4188fecea..e81936886 100644
--- a/app/views/admin/homework.html.erb
+++ b/app/views/admin/homework.html.erb
@@ -37,9 +37,11 @@
             <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="name" title='<%=homework.name%>'>
               <%=link_to(homework.name, student_work_index_path(:homework => homework.id))%>
             </td>
+            <% if homework.course %>
             <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="name" title='<%=homework.course.name%>'>
               <%= link_to(homework.course.name, course_path(homework.course.id)) %>
             </td>
+            <% end %>
             <td align="center" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="name" title='<% if homework.try(:user).try(:realname) == ' '%><%= homework.try(:user)%><% else %><%=homework.try(:user).try(:realname) %><% end %>'>
               <% if homework.try(:user).try(:realname) == ' '%>
                   <%= link_to(homework.try(:user), user_path(homework.user_id)) %>

From 02ebaf23d195f615df3aa66eb81774a0a74c40b1 Mon Sep 17 00:00:00 2001
From: linchun <sxszwlc@sina.cn>
Date: Fri, 1 Apr 2016 16:17:26 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=91=98=E7=95=8C=E9=9D=A2=E7=BB=84=E7=BB=87=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=80=BB=E7=BB=84=E7=BB=87=E7=9A=84=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/admin/organization.html.erb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/views/admin/organization.html.erb b/app/views/admin/organization.html.erb
index 02b897f80..6fde09ede 100644
--- a/app/views/admin/organization.html.erb
+++ b/app/views/admin/organization.html.erb
@@ -24,7 +24,8 @@
         <tr class="<%= cycle("odd", "even") %>">
           <td style="text-align:center;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="name" title='<%=org.name%>'>
             <span>
-              <%= link_to org.name,home_path(:organization => org.id) %>
+              <%#= link_to org.name,home_path(:organization => org.id) %>
+              <%= link_to org.name, organization_path(org) %>
             </span>
           </td>
           <td align="center">