diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index 41ea9c45e..21dac6ada 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -888,23 +888,25 @@ class CoursesController < ApplicationController if params[:type].present? case params[:type] when "homework" - @course_activities = course_activities.where("course_act_type = 'HomeworkCommon'").order('updated_at desc').limit(10).offset(@page * 10) + @course_activities = course_activities.where("course_act_type = 'HomeworkCommon'").order('updated_at desc') when "news" - @course_activities = course_activities.where("course_act_type = 'News'").order('updated_at desc').limit(10).offset(@page * 10) + @course_activities = course_activities.where("course_act_type = 'News'").order('updated_at desc') when "message" - @course_activities = course_activities.where("course_act_type = 'Message'").order('updated_at desc').limit(10).offset(@page * 10) + @course_activities = course_activities.where("course_act_type = 'Message'").order('updated_at desc') when "poll" - @course_activities = course_activities.where("course_act_type = 'Poll'").order('updated_at desc').limit(10).offset(@page * 10) + @course_activities = course_activities.where("course_act_type = 'Poll'").order('updated_at desc') when "attachment" - @course_activities = course_activities.where("course_act_type = 'Attachment'").order('updated_at desc').limit(10).offset(@page * 10) + @course_activities = course_activities.where("course_act_type = 'Attachment'").order('updated_at desc') when "journalsForMessage" - @course_activities = course_activities.where("course_act_type = 'JournalsForMessage'").order('updated_at desc').limit(10).offset(@page * 10) + @course_activities = course_activities.where("course_act_type = 'JournalsForMessage'").order('updated_at desc') else - @course_activities = course_activities.order('updated_at desc').limit(10).offset(@page * 10) + @course_activities = course_activities.order('updated_at desc') end else - @course_activities = course_activities.order('updated_at desc').limit(10).offset(@page * 10) + @course_activities = course_activities.order('updated_at desc') end + @course_activities_count = @course_activities.count + @course_activities = @course_activities.limit(10).offset(@page * 10) @type = params[:type] @left_nav_type = 1 diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb index fae350a6a..3e41e2c91 100644 --- a/app/controllers/messages_controller.rb +++ b/app/controllers/messages_controller.rb @@ -56,6 +56,7 @@ class MessagesController < ApplicationController all @replies = paginateHelper messages_replies,10 @reply = Message.new(:subject => "RE: #{@message.subject}") + @left_nav_type = 2 render :action => "show", :layout => "base_courses"#by young elsif @project @reply_pages = Paginator.new @reply_count, REPLIES_PER_PAGE, page diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 089333160..58622a089 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -33,6 +33,12 @@ module ApplicationHelper extend Forwardable def_delegators :wiki_helper, :wikitoolbar_for, :heads_for_wiki_formatter + def user_path(resource, parameters = {}) + if Fixnum === resource + resource = User.find(resource) + end + super + end # def user_blogs_path(resource,parameters={}) # super @@ -54,7 +60,7 @@ module ApplicationHelper # 获取用户单位 # 优先获取高校信息，如果改信息不存在则获取occupation def get_occupation_from_user user - School.where("id=?",user.user_extensions.school_id).first.try(:name).nil? ? user.user_extensions.occupation : School.where("id=?",user.user_extensions.school_id).first.try(:name) + School.where("id=?",user.user_extensions.school_id).first.try(:name).nil? ? user.user_extensions.try(:occupation) : School.where("id=?",user.user_extensions.school_id).first.try(:name) end def update_visiti_count container diff --git a/app/models/user.rb b/app/models/user.rb index 996aa9be7..7e592248e 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -311,6 +311,11 @@ class User < Principal ) end + # id 转换成 登录名 + def to_param + Fixnum === self.login ? id : login + end + # ====================================================================== def my_workplace self.user_extensions.try(:occupation).to_s diff --git a/app/views/courses/_course_activity.html.erb b/app/views/courses/_course_activity.html.erb index 16d151d83..993c767d6 100644 --- a/app/views/courses/_course_activity.html.erb +++ b/app/views/courses/_course_activity.html.erb @@ -78,7 +78,7 @@ <% end %> <% end %> -<% if course_activities.count == 10 %> +<% if course_activities.count + page * 10 < @course_activities_count %> <%= link_to "点击展开更多",course_activity_path(@course.id, :type => type, :page => page),:id => "show_more_course_activities",:remote => "true",:class => "loadMore mt10 f_grey"%> <% end %> diff --git a/app/views/courses/_recommendation.html.erb b/app/views/courses/_recommendation.html.erb index ea129577b..ece60cdd1 100644 --- a/app/views/courses/_recommendation.html.erb +++ b/app/views/courses/_recommendation.html.erb @@ -5,8 +5,15 @@
  • <%= i+1 %> <%=link_to e_course.name, course_path(e_course.id), :class => "sy_class_ltitle fl mb10" %> -

    作业<%=e_course.homework_commons.where("publish_time <= '#{Date.today}'").count %> - 资源<%=visable_attachemnts_incourse(e_course).count %> +

    + <% homework_count = e_course.homework_commons.where("publish_time <= '#{Date.today}'").count %> + <% if homework_count > 0 %> + 作业<%=homework_count %> + <% end %> + <% file_count = visable_attachemnts_incourse(e_course).count %> + <% if file_count > 0 %> + 资源<%=file_count %> + <% end %>

    • <% end %> diff --git a/app/views/courses/member.html.erb b/app/views/courses/member.html.erb index 7a58315a2..4eeef6d1a 100644 --- a/app/views/courses/member.html.erb +++ b/app/views/courses/member.html.erb @@ -1,3 +1,4 @@ +

    <%= @subPage_title%>

    <% if User.current.allowed_to?(:as_teacher,@course) %> @@ -11,5 +12,6 @@ <% else%> <%= render :partial => 'course_teacher', :locals => {:members => @members} %> <% end%> +
    diff --git a/app/views/courses/private_or_public.js.erb b/app/views/courses/private_or_public.js.erb index 82180c452..835728626 100644 --- a/app/views/courses/private_or_public.js.erb +++ b/app/views/courses/private_or_public.js.erb @@ -1,5 +1,5 @@ <% if params[:user_page].nil? %> - $("#project_info_<%=@course.id %>").html('<%=escape_javascript(render :partial=>'layouts/project_info') %>'); + $("#project_info_<%=@course.id %>").html('<%=escape_javascript(render :partial=>'layouts/course_base_info') %>'); if(document.getElementById("course_is_public")) { <% if @course.is_public == 0%> $("#course_is_public").attr("checked",false); diff --git a/app/views/courses/settings.html.erb b/app/views/courses/settings.html.erb index edcb129a9..fabd687e0 100644 --- a/app/views/courses/settings.html.erb +++ b/app/views/courses/settings.html.erb @@ -1,3 +1,4 @@ +

    <%= l(:label_course_modify_settings)%>

    @@ -6,6 +7,7 @@ <% if @select_tab == 'member'%> $("#tb_2").click(); <% end %> + $("#homework_page_right").css("min-height",$("#courseLSide").height()+45); })
    @@ -144,3 +146,4 @@ //$("#time").click(select); //$("#term").click(select); +
    \ No newline at end of file diff --git a/app/views/homework_common/edit.html.erb b/app/views/homework_common/edit.html.erb index 0c120b7c2..d4d9d7c16 100644 --- a/app/views/homework_common/edit.html.erb +++ b/app/views/homework_common/edit.html.erb @@ -36,7 +36,7 @@
    -
    +
    <%= form_for @homework do |f| %> diff --git a/app/views/layouts/_course_base_info.html.erb b/app/views/layouts/_course_base_info.html.erb index bd152ac6e..04162fc9c 100644 --- a/app/views/layouts/_course_base_info.html.erb +++ b/app/views/layouts/_course_base_info.html.erb @@ -45,7 +45,7 @@ 主讲老师：<%= link_to(@course.teacher.show_name, user_path(@course.teacher), :class => 'sy_cblue') %> 学时：<%= @course.class_period %>学时 学期：<%= current_time_and_term @course %> - 单位：<%= @course.school ? @course.school : '无' %> + 单位：<%= get_occupation_from_user(@course.teacher).blank? ? '无' : get_occupation_from_user(@course.teacher) %>

    <% unless is_teacher %> diff --git a/app/views/layouts/_syllabus_base_info.html.erb b/app/views/layouts/_syllabus_base_info.html.erb index 446473db5..335dc3335 100644 --- a/app/views/layouts/_syllabus_base_info.html.erb +++ b/app/views/layouts/_syllabus_base_info.html.erb @@ -52,9 +52,9 @@
    -<% if User.current.logged? && (User.current == syllabus.user || User.current.admin?)&&(syllabus.syllabus_type.nil? || syllabus.syllabus_type == 0 || syllabus.syllabus_type == ''||syllabus.credit.nil? || syllabus.credit == ''||syllabus.hours.nil? || syllabus.hours == ''||syllabus.theory_hours.nil? || syllabus.theory_hours == ''||syllabus.practice_hours.nil? || syllabus.practice_hours == ''||syllabus.applicable_major.nil? || syllabus.applicable_major == ''||syllabus.pre_course.nil? || syllabus.pre_course == '')%> - -<% end %> +<%# if User.current.logged? && (User.current == syllabus.user || User.current.admin?)&&(syllabus.syllabus_type.nil? || syllabus.syllabus_type == 0 || syllabus.syllabus_type == ''||syllabus.credit.nil? || syllabus.credit == ''||syllabus.hours.nil? || syllabus.hours == ''||syllabus.theory_hours.nil? || syllabus.theory_hours == ''||syllabus.practice_hours.nil? || syllabus.practice_hours == ''||syllabus.applicable_major.nil? || syllabus.applicable_major == ''||syllabus.pre_course.nil? || syllabus.pre_course == '')%> + +<%# end %>