Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
This commit is contained in:
commit
511fda0b40
|
@ -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>
|
|
@ -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 %>
|
||||
|
|
|
@ -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('');
|
||||
|
|
Loading…
Reference in New Issue