diff --git a/app/controllers/subjects_controller.rb b/app/controllers/subjects_controller.rb index de31d9338..0b746c675 100644 --- a/app/controllers/subjects_controller.rb +++ b/app/controllers/subjects_controller.rb @@ -95,7 +95,7 @@ class SubjectsController < ApplicationController end def append_to_stage - @shixuns = Shixun.where(:id => params[:shixun_id]) + @shixuns = Shixun.where(:id => params[:choose_ids].split(",")).reorder("id desc") end def publish diff --git a/app/views/layouts/base_subject.html.erb b/app/views/layouts/base_subject.html.erb index eca18d661..1b27ea123 100644 --- a/app/views/layouts/base_subject.html.erb +++ b/app/views/layouts/base_subject.html.erb @@ -10,6 +10,9 @@ <%= javascript_heads %> <%= heads_for_theme %> <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','css/edu-popup','css/edu-common', "css/edu-public", 'css/taskstyle', 'css/edu-subject', 'css/moduel', 'css/font-awesome', 'css/edu-tooltipster', 'css/magic-check' %> + + + <%= javascript_include_tag 'application', 'cookie',"avatars", 'header','prettify','attachments','edu/application','edu/subject' %> <%= call_hook :view_layouts_base_html_head %> <%= yield :header_tags -%> @@ -43,8 +46,5 @@
<%= call_hook :view_layouts_base_body_bottom %>