diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index 71715035e..29f2e00f4 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -106,74 +106,17 @@ class CoursesController < ApplicationController # 课程搜索 # add by nwb def search - courses_all = Course.all_course - name = params[:name] - if name.blank? - @courses = [] - @courses_all = [] - @course_count = 0 - @course_pages = Paginator.new @course_count, per_page_option, params['page'] + if params[:name].empty? + courses = Course.visible + @courses = paginateHelper courses,10 else - @courses = courses_all.visible - if params[:name].present? - @courses_all = @courses.like(params[:name]) - else - @courses_all = @courses; - end - @course_count = @courses_all.count - @course_pages = Paginator.new @course_count, per_page_option, params['page'] - - # 课程的动态数 - # @course_activity_count=Hash.new - # @courses_all.each do |course| - # @course_activity_count[course.id]=0 - # end - # - # case params[:course_sort_type] - # when '0' - # @courses = @courses_all.order("created_at desc") - # @s_type = 0 - # @courses = @courses.offset(@course_pages.offset).limit(@course_pages.per_page) - # - # @course_activity_count=get_course_activity @courses,@course_activity_count - # - # when '1' - # @courses = @courses_all.order("course_ac_para desc") - # @s_type = 1 - # @courses = @courses.offset(@course_pages.offset).limit(@course_pages.per_page) - # - # @course_activity_count=get_course_activity @courses,@course_activity_count - # - # when '2' - # @courses = @courses_all.order("watchers_count desc") - # @s_type = 2 - # @courses = @courses.offset(@course_pages.offset).limit(@course_pages.per_page) - # - # @course_activity_count=get_course_activity @courses,@course_activity_count - # - # when '3' - # @course_activity_count=get_course_activity @courses_all,@course_activity_count_array - # @courses=handle_course @courses_all,@course_activity_count - # @s_type = 3 - # @courses = @courses[@course_pages.offset, @course_pages.per_page] - # - # else - # @s_type = 0 - # @courses = @courses_all.order("created_at desc") - # @courses = @courses.offset(@course_pages.offset).limit(@course_pages.per_page) - # - # @course_activity_count=get_course_activity @courses,@course_activity_count - # - # end + courses = Course.visible.where("LOWER(name) like '%#{params[:name].to_s.downcase}%'") + @courses = paginateHelper courses,10 end respond_to do |format| format.html { render :layout => 'course_base' - scope = Course - unless params[:closed] - scope = scope.active - end } format.atom { courses = Course.visible.order('created_on DESC').limit(Setting.feeds_limit.to_i).all diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb index ac142f5a1..f9fb31969 100644 --- a/app/helpers/courses_helper.rb +++ b/app/helpers/courses_helper.rb @@ -704,7 +704,7 @@ module CoursesHelper url = course_feedback_path(activity.course) when "Poll" title = "问卷 " + activity.course_act.polls_name - url = poll_index_path(:polls_type => "Course", :polls_group_id => activity.course_id) + url = poll_path(activity.course_act_id) end end link_to title.gsub(/<(?!img)[^>]*>/,'').html_safe, url, :class => "problem_tit c_dblue fl fb" diff --git a/app/models/poll.rb b/app/models/poll.rb index 34a381246..3adbbb791 100644 --- a/app/models/poll.rb +++ b/app/models/poll.rb @@ -10,7 +10,7 @@ class Poll < ActiveRecord::Base has_many :acts, :class_name => 'Activity', :as => :act, :dependent => :destroy # 课程动态 has_many :course_acts, :class_name => 'CourseActivity',:as =>:course_act ,:dependent => :destroy - after_create :act_as_activity, :act_as_course_activity + before_save :act_as_activity, :act_as_course_activity acts_as_event :title => Proc.new {|o| "#{l(:label_course_poll)}: #{o.polls_name}" }, :description => :polls_description, @@ -32,7 +32,11 @@ class Poll < ActiveRecord::Base #课程动态公共表记录 def act_as_course_activity if self.polls_type == "Course" - self.course_acts << CourseActivity.new(:user_id => self.user_id,:course_id => self.polls_group_id) + if self.polls_status == 2 #问卷是发布状态 + self.course_acts << CourseActivity.new(:user_id => self.user_id,:course_id => self.polls_group_id) + elsif self.polls_status == 1 #问卷是新建状态 + self.course_acts.destroy_all + end end end end diff --git a/app/views/courses/search.html.erb b/app/views/courses/search.html.erb index 98b056487..c19f9821a 100644 --- a/app/views/courses/search.html.erb +++ b/app/views/courses/search.html.erb @@ -39,17 +39,17 @@ <% end %> -<% if @courses.size == 0 %> -<%= render :partial => 'layouts/no_content'%> +<% if @courses && !@courses.empty? %> +
+ <%= render_course_hierarchy(@courses)%> +
<% else %> -
- <%= render_course_hierarchy(@courses)%> -
+ <%= render :partial => 'layouts/no_content'%> <% end %> diff --git a/app/views/courses/show.html.erb b/app/views/courses/show.html.erb index 7159c3c83..6eb722981 100644 --- a/app/views/courses/show.html.erb +++ b/app/views/courses/show.html.erb @@ -24,7 +24,7 @@ <%= course_activity_desc activity%>
- <%= l :label_activity_time %> ： <%= format_time(activity.created_at) %> + <%= activity.course_act_type == "Course" ? l(:label_create_time) : l(:label_activity_time) %> ： <%= format_time(activity.created_at) %>

<%= link_to_attachments_course(activity.course_act) if activity.course_act_type.to_s == "News" %> diff --git a/app/views/homework_common/_homework_detail_manual_form.html.erb b/app/views/homework_common/_homework_detail_manual_form.html.erb index ffec93e73..3af12973a 100644 --- a/app/views/homework_common/_homework_detail_manual_form.html.erb +++ b/app/views/homework_common/_homework_detail_manual_form.html.erb @@ -48,7 +48,8 @@