diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 411f47f1e..1fbee6fbb 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -3187,9 +3187,6 @@ class UsersController < ApplicationController sort_name = "updated_at" sort_type = @c_sort == 1 ? "asc" : "desc" - # @courses = @user.courses.visible.where("is_delete =?", 0).order("#{sort_name} #{sort_type}") - #@courses = @user.courses.visible.where("is_delete =?", 0).select("courses.*,(SELECT MAX(updated_at) FROM `course_activities` WHERE course_activities.course_id = courses.id) AS #{sort_name}").order("#{sort_name} #{sort_type}") - @courses = @user.courses.visible.where("is_delete =?", 0) syllabus_ids = @courses.empty? ? '(-1)' : "(" + @courses.map{|course| !course.syllabus_id.nil? && course.syllabus_id}.join(",") + ")" @syllabus = Syllabus.where("id in #{syllabus_ids} or user_id = #{User.current.id}").order("#{sort_name} #{sort_type}") @@ -3197,12 +3194,6 @@ class UsersController < ApplicationController #根据 作业+资源数排序 if @order.to_i == 2 @type = 2 - # @courses.each do |course| - # course[:infocount] = (User.current.admin? || User.current.allowed_to?(:as_teacher,course)) ? (course.homework_commons.count + visable_attachemnts_incourse(course).count) : (course.homework_commons.where("publish_time <= '#{Date.today}'").count + visable_attachemnts_incourse(course).count) - # if course[:infocount] < 0 - # course[:infocount] = 0 - # end - # end @syllabus.each do |syllabus| count = 0 courses = @courses.where("syllabus_id = #{syllabus.id}") diff --git a/app/views/courses/new.html.erb b/app/views/courses/new.html.erb index 1ceaa06f5..7e054e7c8 100644 --- a/app/views/courses/new.html.erb +++ b/app/views/courses/new.html.erb @@ -12,7 +12,7 @@ <%=@syllabus.title %> <% end %> - +
  • diff --git a/app/views/layouts/_project_info.html.erb b/app/views/layouts/_project_info.html.erb index 651d8d1e4..1c0a2ac08 100644 --- a/app/views/layouts/_project_info.html.erb +++ b/app/views/layouts/_project_info.html.erb @@ -9,11 +9,11 @@ <%= image_tag(url_to_avatar(@course), :width => "60", :height => "60") %>
    - <%=@course.is_public == 1 ? '(私有)' : '公开' %> + <%=@course.is_public == 0 ? '(私有)' : '(公开)' %>
    <% if @course.syllabus%> - <% end %> diff --git a/app/views/layouts/_syllabus_info.html.erb b/app/views/layouts/_syllabus_info.html.erb index d8e18e37a..61aa011c3 100644 --- a/app/views/layouts/_syllabus_info.html.erb +++ b/app/views/layouts/_syllabus_info.html.erb @@ -5,7 +5,7 @@ <%= image_tag("../images/syllabus.jpg",width:"60px", height: "60px") %>
    -

    <%=@syllabus.title %>

    +

    <%=@syllabus.title %>

    diff --git a/app/views/syllabuses/show.html.erb b/app/views/syllabuses/show.html.erb index 989d31984..e64343d90 100644 --- a/app/views/syllabuses/show.html.erb +++ b/app/views/syllabuses/show.html.erb @@ -13,11 +13,11 @@
    <% if User.current == @syllabus.user %>

    您建立的课程还未创建班级,请 - <%= link_to "新建班级", new_course_path(:host=> Setting.host_course, :syllabus_id => @syllabus.id), :class => "syllabusbox_a_blue", :target => '_blank'%>。 + <%= link_to "新建班级", new_course_path(:host=> Setting.host_course, :syllabus_id => @syllabus.id), :class => "syllabusbox_a_blue", :target => '_blank'%>

    <% elsif User.current.user_extensions && User.current.user_extensions.identity == 0 && User.current.allowed_to?(:add_course, nil, :global => true)%>

    本课程下还未创建班级,请 - <%= link_to "新建班级", new_course_path(:host=> Setting.host_course, :syllabus_id => @syllabus.id), :class => "syllabusbox_a_blue", :target => '_blank'%>。 + <%= link_to "新建班级", new_course_path(:host=> Setting.host_course, :syllabus_id => @syllabus.id), :class => "syllabusbox_a_blue", :target => '_blank'%>

    <% else %>

    本课程下还未创建班级,敬请期待。