From a8b4bde77c9cad26906169c7a9ab495554983dcc Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Tue, 20 Oct 2015 14:38:24 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=AD=A6=E6=A0=A1=E5=88=97=E8=A1=A8div=20?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=E5=88=86=E9=A1=B5=20=E6=9C=80=E5=A4=A7?=
 =?UTF-8?q?=E9=A1=B5=20=E8=AE=A1=E7=AE=97=E6=96=B9=E6=B3=95=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb
index 0531ea9e7..7bc674ea6 100644
--- a/app/views/my/account.html.erb
+++ b/app/views/my/account.html.erb
@@ -603,7 +603,7 @@
               success: function (data) {
                   schoolsResult = data.schools;
                   count = data.count;
-                  maxPage = count % 100 + 1; //最大页码值
+                  maxPage = Math.ceil(count/100) //最大页码值
                   if(schoolsResult.length != undefined && schoolsResult.length != 0) {
                       var i = 0;
                       $("#search_school_result_list").html('');

From cc59b4c8779aad6cbf7216d36c4a5b2c36c3e415 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 20 Oct 2015 15:15:18 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E8=AE=A8=E8=AE=BA?=
 =?UTF-8?q?=E5=8C=BA=E7=BC=96=E8=BE=91=E5=B8=96=E5=AD=90=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/boards/_course_message_edit.html.erb | 2 +-
 app/views/messages/edit.html.erb               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/boards/_course_message_edit.html.erb b/app/views/boards/_course_message_edit.html.erb
index 16807afb0..caa389945 100644
--- a/app/views/boards/_course_message_edit.html.erb
+++ b/app/views/boards/_course_message_edit.html.erb
@@ -12,5 +12,5 @@
     </div>
   </div>
   <%= render :partial => 'boards/course_new',
-             :locals => {:f => f, :edit_mode => edit_mode, :topic => topic} %>
+             :locals => {:f => f, :edit_mode => edit_mode, :topic => topic, :course => course} %>
 </div>
\ No newline at end of file
diff --git a/app/views/messages/edit.html.erb b/app/views/messages/edit.html.erb
index 0817594ab..624174b14 100644
--- a/app/views/messages/edit.html.erb
+++ b/app/views/messages/edit.html.erb
@@ -30,7 +30,7 @@
                       :method => :post}
     } do |f| %>
         <%= render :partial => 'boards/course_message_edit',
-                   :locals => {:f => f, :edit_mode => true, :topic => @message} %>
+                   :locals => {:f => f, :edit_mode => true, :topic => @message, :course => @message.course} %>
 
     <% end %>
 <% end %>