diff --git a/app/api/mobile/apis/courses.rb b/app/api/mobile/apis/courses.rb index 6d68d549a..08c7adf10 100644 --- a/app/api/mobile/apis/courses.rb +++ b/app/api/mobile/apis/courses.rb @@ -80,6 +80,10 @@ module Mobile class_period: params[:class_period] } course = ::Course.find(params[:course_id]) + # 如果没有传密码过来，那就把原来的密码给上，不然会不更新 + if params[:password].nil? || params[:password].blank? + cs_params[:course][:password] = course[:password] + end cs.edit_course_authorize(current_user,course) course = cs.edit_course(cs_params, course,current_user) present :data, course, with: Mobile::Entities::Course diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index a243018ba..8e57fab4d 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -681,9 +681,10 @@ class CoursesController < ApplicationController "show_course_files" => true, "show_course_news" => true, "show_course_messages" => true, - "show_course_journals_for_messages" => true, + #"show_course_journals_for_messages" => true, "show_bids" => true, - "show_homeworks" => true + "show_homeworks" => true, + #"show_polls" => true } @date_to ||= Date.today + 1 @date_from = (@date_to - @days) > @course.created_at.to_date ? (@date_to - @days) : @course.created_at.to_date diff --git a/app/controllers/settings_controller.rb b/app/controllers/settings_controller.rb index c60d1bd8f..93e0e9c4b 100644 --- a/app/controllers/settings_controller.rb +++ b/app/controllers/settings_controller.rb @@ -29,6 +29,9 @@ class SettingsController < ApplicationController end def edit + hidden_non_project = Setting.find_by_name("hidden_non_project") + @text = (hidden_non_project && hidden_non_project.value == "0") ? l(:label_show_non_project) : l(:label_hidden_non_project) + @notifiables = Redmine::Notifiable.all if request.post? && params[:settings] && params[:settings].is_a?(Hash) settings = (params[:settings] || {}).dup.symbolize_keys @@ -70,4 +73,20 @@ class SettingsController < ApplicationController rescue Redmine::PluginNotFound render_404 end + + #隐藏/显示非项目信息 + def hidden_non_project + @notifiable = Setting.find_by_name("hidden_non_project") + if @notifiable + @notifiable.value == "1" ? @notifiable.value = 0 : @notifiable.value = 1 + @notifiable.save + else + @notifiable = Setting.new() + @notifiable.name = "hidden_non_project" + @notifiable.value = 0 + @notifiable.save + end + + redirect_to settings_url + end end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index f36e4b397..095d0ada5 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -132,9 +132,10 @@ module ApplicationHelper def link_to_user_header user,canShowRealName=false,options={} if user.is_a?(User) if canShowRealName - name = h(user.realname(options[:format])) + name = user.show_name + name = user.login if name == "" else - name = h(user.name(options[:format])) + name = user.login end link_to name, {:controller=> 'users', :action => 'show', id: user.id, host: Setting.user_domain}, :class => options[:class] else @@ -1947,6 +1948,8 @@ module ApplicationHelper end def bootstrap_render_dynamic_nav + hidden_non_project = Setting.find_by_name("hidden_non_project") + visiable = !(hidden_non_project && hidden_non_project.value == "0") main_course_link = link_to l(:label_course_practice), {:controller => 'welcome', :action => 'index', :host => Setting.course_domain} main_project_link = link_to l(:label_project_deposit), {:controller => 'welcome', :action => 'index', :host => Setting.project_domain} @@ -1964,21 +1967,21 @@ module ApplicationHelper #@nav_dispaly_project_label nav_list = Array.new - nav_list.push(school_all_school_link) if @nav_dispaly_course_all_label && @show_course == 1 + nav_list.push(school_all_school_link) if @nav_dispaly_course_all_label && @show_course == 1 && visiable # nav_list.push(course_all_course_link) if @nav_dispaly_course_all_label && @show_course == 1 - nav_list.push(course_teacher_all_link) if @nav_dispaly_teacher_all_label && @show_course == 1 + nav_list.push(course_teacher_all_link) if @nav_dispaly_teacher_all_label && @show_course == 1 && visiable nav_list.push(main_project_link) if @nav_dispaly_main_project_label - nav_list.push(main_course_link) if @nav_dispaly_main_course_label && @show_course == 1 - nav_list.push(main_contest_link) if @nav_dispaly_main_contest_label && @show_contest == 1 + nav_list.push(main_course_link) if @nav_dispaly_main_course_label && @show_course == 1 && visiable + nav_list.push(main_contest_link) if @nav_dispaly_main_contest_label && @show_contest == 1 && visiable - nav_list.push(courses_link) if @nav_dispaly_course_label && @show_course == 1 + nav_list.push(courses_link) if @nav_dispaly_course_label && @show_course == 1 && visiable # nav_list.push(projects_link) if @nav_dispaly_project_label #nav_list.push(users_link) if @nav_dispaly_user_label # nav_list.push(contest_link) if @nav_dispaly_contest_label && @show_contest == 1 - nav_list.push(bids_link) if @nav_dispaly_bid_label - nav_list.push(forum_link) if @nav_dispaly_forum_label - nav_list.push(stores_link) if @nav_dispaly_store_all_label + nav_list.push(bids_link) if @nav_dispaly_bid_label && visiable + nav_list.push(forum_link) if @nav_dispaly_forum_label && visiable + nav_list.push(stores_link) if @nav_dispaly_store_all_label && visiable content_li = '' nav_list.collect do |nav_item| diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb index 3adcdb09e..f4a5ac193 100644 --- a/app/helpers/courses_helper.rb +++ b/app/helpers/courses_helper.rb @@ -52,7 +52,7 @@ module CoursesHelper end def course_poll_count - Poll.where("polls_type = 'Course' and polls_group_id = #{@course.id}").count + Poll.where("polls_type = 'Course' and polls_group_id = #{@course.id} and polls_status in (2,3)").count end def course_feedback_count @@ -632,48 +632,73 @@ module CoursesHelper #获取课程动态 def get_course_activity courses, activities @course_ids=activities.keys() - @bid_ids = [] days = Setting.activity_days_default.to_i - date_to ||= Date.today + 1 - date_from = date_to - days-1.years + #原来课程动态计算当期时间前(一年+一月)的动态 + # date_to ||= Date.today + 1 + # #date_from = date_to - days-1.years + date_from = @course.created_at.to_date-days #file_count Attachment.where(container_id: @course_ids, container_type: Course).where("created_on>?", date_from).each do |attachment| + if attachment.is_public? || User.current.member_of_course?(@course) || User.current.admin? activities[attachment.container_id]+=1 + else + activities[attachment.container_id] + end end + #message_count + #Board.where(course_id: @course_ids).each do |board| + # activities[board.course_id]+=board.messages.where("updated_on>?", date_from).count + #end + #message_count Board.where(course_id: @course_ids).each do |board| -# activities[board.course_id]+=1 - activities[board.course_id]+=board.messages.where("updated_on>?", date_from).count + countmessage = 0 + # 课程人员退出课程后，之前在讨论区回帖不计入课程动态统计 + board.messages.where("updated_on>?", date_from).each do |message| + if message.author.member_of_course?(@course) + countmessage+=1 + end + end + activities[board.course_id]+=countmessage end #news News.where(course_id: @course_ids).where("created_on>?",date_from).each do |news| + if news.author.member_of_course?(@course) activities[news.course_id]+=1 + end end - #feedbackc_count - JournalsForMessage.where(jour_id: @course_ids, jour_type: Course).each do |jourformess| - activities[jourformess.jour_id]+=1 - end + #feedback_count 留言目前有问题留待下一步处理 + #JournalsForMessage.where(jour_id: @course_ids, jour_type: Course).each do |jourformess| + # activities[jourformess.jour_id]+=1 + #end #homework_count - #HomeworkForCourse.where(course_id: @course_ids).each do |homework| - # @bid_ids<?",date_from).count - - #end + HomeworkForCourse.where(course_id: @course_ids).each do |homework| + countbid=0 + # @bid_ids<?",date_from).each do |bid| + countbid+=1 + end + activities[homework.course_id]+=countbid + end #@bid_ids.each do |bid_id| # activities[] +=Bid.where(id: bid_id ).where("created_on>?",date_from).count - #end + #poll_count + #Poll.where(polls_group_id: @course_ids, polls_type: Course, polls_status: 2||3).where("published_at>?",date_from).each do |poll| + # activities[poll.polls_group_id]+=1 + #end + #end # 动态数 + 1 ( 某某创建了该课程 ) - # activities.each_pair { |key, value| activities[key] = value + 1 } + activities.each_pair { |key, value| activities[key] = value + 1 } return activities end @@ -759,7 +784,7 @@ module CoursesHelper def visable_attachemnts_incourse course result = [] course.attachments.each do |attachment| - if attachment.is_public? || User.current.member_of_course?(course) + if attachment.is_public? || User.current.member_of_course?(course) || User.current.admin? result << attachment end end diff --git a/app/helpers/members_helper.rb b/app/helpers/members_helper.rb index 29ba94924..c8e8bd87b 100644 --- a/app/helpers/members_helper.rb +++ b/app/helpers/members_helper.rb @@ -44,7 +44,11 @@ module MembersHelper # add by nwb # 课程可添加的成员列表 def render_principals_for_new_course_members(course) - scope = Principal.active.sorted.not_member_of_course(course).like(params[:q]) + if params[:q] && params[:q] != "" + scope = Principal.active.sorted.not_member_of_course(course).like(params[:q]) + else + scope = [] + end principals = paginateHelper scope,10 s = content_tag('ul', project_member_check_box_tags_ex('membership[user_ids][]', principals), :class => 'mb5', :id => 'principals') diff --git a/app/models/journals_for_message.rb b/app/models/journals_for_message.rb index 6875e6f4a..dda45965e 100644 --- a/app/models/journals_for_message.rb +++ b/app/models/journals_for_message.rb @@ -49,6 +49,7 @@ class JournalsForMessage < ActiveRecord::Base acts_as_activity_provider :type => 'course_journals_for_messages', :author_key => :user_id, + :permission => :view_course_journals_for_messages, :timestamp => "#{self.table_name}.updated_on", :find_options => {:include => :course } diff --git a/app/models/poll.rb b/app/models/poll.rb index 06f1369c1..943c08b51 100644 --- a/app/models/poll.rb +++ b/app/models/poll.rb @@ -6,4 +6,23 @@ class Poll < ActiveRecord::Base has_many :poll_questions, :dependent => :destroy,:order => "#{PollQuestion.table_name}.question_number" has_many :poll_users, :dependent => :destroy has_many :users, :through => :poll_users #该文件被哪些用户提交答案过 + # 添加课程的poll动态 +# has_many :acts, :class_name => 'Activity', :as => :act, :dependent => :destroy +# after_create :act_as_activity + +# acts_as_event :title => Proc.new {|o| "#{l(:label_my_message)} ##{o.id}: #{o.name}" }, +# :description => :description, +# :author => :author, +# :url => Proc.new {|o| {:controller => 'poll', :action => 'show', :id => o.id}} + +# acts_as_activity_provider :type => 'polls', +# :permission => :view_course_polls, + #:find_options => {:include => [:course, :author]}, + #:timestamp => "#{self.table_name}.published_at", +# :author_key => :author_id + +# def act_as_activity +# self.acts << Activity.new(:user_id => self.user_id) +# end + end diff --git a/app/views/bids/start_anonymous_comment.js.erb b/app/views/bids/start_anonymous_comment.js.erb index 5b13b2f77..431393a0e 100644 --- a/app/views/bids/start_anonymous_comment.js.erb +++ b/app/views/bids/start_anonymous_comment.js.erb @@ -1,9 +1,8 @@ <% if @statue == 1%> alert('启动成功'); - $("#<%= @bid.id %>_start_anonymous_comment").remove(); - $("#<%= @bid.id %>_anonymous_comment").append('<%= link_to "关闭匿评", alert_anonymous_comment_bid_path(@bid), remote: true, id:"#{@bid.id}_stop_anonymous_comment" %>'); + $("#<%= @bid.id %>_start_anonymous_comment").replaceWith('<%= escape_javascript(link_to "关闭匿评", alert_anonymous_comment_bid_path(@bid), remote: true, id:"#{@bid.id}_stop_anonymous_comment",:class => "fr mr10 work_edit")%>'); <% elsif @statue == 2 %> alert('启动失败\n作业总数大于等于2份时才能启动匿评'); <% elsif @statue == 3%> alert("已开启匿评，请务重复开启"); -<% end %> +<% end %> \ No newline at end of file diff --git a/app/views/bids/stop_anonymous_comment.js.erb b/app/views/bids/stop_anonymous_comment.js.erb index cf2096d3b..cf22d0623 100644 --- a/app/views/bids/stop_anonymous_comment.js.erb +++ b/app/views/bids/stop_anonymous_comment.js.erb @@ -1,2 +1,2 @@ alert('关闭成功'); -$("#<%= @bid.id %>_anonymous_comment").html('匿评结束'); +$("#<%= @bid.id %>_stop_anonymous_comment").replaceWith('匿评结束'); diff --git a/app/views/courses/_member.html.erb b/app/views/courses/_member.html.erb index 53e7c15a5..a4b5bae6e 100644 --- a/app/views/courses/_member.html.erb +++ b/app/views/courses/_member.html.erb @@ -1,6 +1,6 @@ <% @members.each do |member| %>
  • - <%= link_to_user_header member.principal,false,:class => "w150 c_orange fl" %> + <%= link_to_user_header member.principal,true,:class => "w150 c_orange fl" %> <%= h member.roles.sort.collect(&:to_s).join(', ') %> <%= form_for(member, {:as => :membership, :remote => true, :url => membership_path(member), diff --git a/app/views/files/_course_list.html.erb b/app/views/files/_course_list.html.erb index 7fc079bcb..3d692a36b 100644 --- a/app/views/files/_course_list.html.erb +++ b/app/views/files/_course_list.html.erb @@ -15,7 +15,7 @@
    -<% curse_attachments.sort.reverse.each do |file| %> +<% curse_attachments.each do |file| %> <% if file.is_public? || User.current.member_of_course?(course) %>
    diff --git a/app/views/forums/_show_topics.html.erb b/app/views/forums/_show_topics.html.erb index 7a9eb4316..e61995ecc 100644 --- a/app/views/forums/_show_topics.html.erb +++ b/app/views/forums/_show_topics.html.erb @@ -26,7 +26,10 @@ <%= authoring topic.created_at, topic.author %> - 最后回复：<%=link_to_user topic.last_reply.try(:author) %> + <% author = topic.last_reply.try(:author)%> + <% if author%> + 最后回复：<%=link_to_user author %> + <% end%>
    diff --git a/app/views/layouts/_base_header.html.erb b/app/views/layouts/_base_header.html.erb index 75c39a407..9eaf7f6ed 100644 --- a/app/views/layouts/_base_header.html.erb +++ b/app/views/layouts/_base_header.html.erb @@ -11,8 +11,10 @@
    • <%=link_to_user(User.current)%> + <% hidden_non_project = Setting.find_by_name("hidden_non_project") + visiable = hidden_non_project && hidden_non_project.value == "0"%>
        - <% if @show_course == 1 %> + <% if @show_course == 1 && !visiable %> <% if User.current.user_extensions && [UserExtensions::TEACHER, UserExtensions::STUDENT].include?(User.current.user_extensions.identity) -%> <% hasCourse=false %> <% User.current.courses.each do |course| %> diff --git a/app/views/layouts/base_forums.html.erb b/app/views/layouts/base_forums.html.erb index a7e2ef08a..f12b3186d 100644 --- a/app/views/layouts/base_forums.html.erb +++ b/app/views/layouts/base_forums.html.erb @@ -53,7 +53,7 @@
        <%= @forum.name %>
        -
        <%= @forum.description %>
        +
        <%= @forum.description.html_safe %>
        创建人信息
        diff --git a/app/views/layouts/base_homework.html.erb b/app/views/layouts/base_homework.html.erb index 27a8e67f4..dd7db06de 100644 --- a/app/views/layouts/base_homework.html.erb +++ b/app/views/layouts/base_homework.html.erb @@ -32,8 +32,10 @@ padding-left: 5px !important; padding-right: 5px !important; line-height: 1.9; + float: left; } .span_wping a:hover{ background-color:#03a1b3;} + .span_wping_background{background: #CCC !important;} diff --git a/app/views/layouts/base_memos.html.erb b/app/views/layouts/base_memos.html.erb index 52b456cd0..1f815576f 100644 --- a/app/views/layouts/base_memos.html.erb +++ b/app/views/layouts/base_memos.html.erb @@ -84,7 +84,7 @@
        <%= @forum.name %>
        -
        <%= @forum.description %>
        +
        <%= @forum.description.html_safe %>
        创建人信息
        diff --git a/app/views/layouts/base_users.html.erb b/app/views/layouts/base_users.html.erb index 213c9ed07..3f603368a 100644 --- a/app/views/layouts/base_users.html.erb +++ b/app/views/layouts/base_users.html.erb @@ -145,6 +145,7 @@ <%= f.text_area 'user_introduction', :rows => 3, :cols => 65, :placeholder => "#{l(:label_my_brief_introduction)}", + :maxlength => 200, :style => "resize: none;", :class => 'noline'%> diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb index 0db7c4e4a..fb66c621e 100644 --- a/app/views/memos/show.html.erb +++ b/app/views/memos/show.html.erb @@ -64,7 +64,7 @@ <%=h @memo.subject %>
        - <%= textAreailizable(@memo,:content) %> + <%= @memo.content.html_safe %>

        <% if @memo.attachments.any?%> <% options = {:author => true, :deletable => @memo.deleted_attach_able_by?(User.current) } %> diff --git a/app/views/settings/edit.html.erb b/app/views/settings/edit.html.erb index 8de53f55c..798db291b 100644 --- a/app/views/settings/edit.html.erb +++ b/app/views/settings/edit.html.erb @@ -1,4 +1,6 @@ -

        <%= l(:label_settings) %>

        +

        <%=l(:label_settings)%>

        +<%= link_to @text,settings_hidden_non_project_path,:id => "hidden_non_project",:style => "float: right;margin-right: 60px;margin-top: 9px;"%> +
        <%= render_tabs administration_settings_tabs %> diff --git a/app/views/settings/hidden_non_project.js.erb b/app/views/settings/hidden_non_project.js.erb new file mode 100644 index 000000000..370fea33a --- /dev/null +++ b/app/views/settings/hidden_non_project.js.erb @@ -0,0 +1,5 @@ +<% if @notifiable.value == "0"%> + $("#hidden_non_project").replaceWith("<%= escape_javascript(link_to '显示非项目信息',settings_hidden_non_project_path,:id => 'hidden_non_project',:style => 'float: right;margin-right: 60px;margin-top: 9px;', :remote => true)%>"); +<% else%> + $("#hidden_non_project").replaceWith("<%= escape_javascript(link_to '隐藏非项目信息',settings_hidden_non_project_path,:id => 'hidden_non_project',:style => 'float: right;margin-right: 60px;margin-top: 9px;', :remote => true)%>"); +<% end%> \ No newline at end of file diff --git a/app/views/welcome/_link_to_another.html.erb b/app/views/welcome/_link_to_another.html.erb index e9a19be4e..6540409d1 100644 --- a/app/views/welcome/_link_to_another.html.erb +++ b/app/views/welcome/_link_to_another.html.erb @@ -1,6 +1,9 @@ - +<%hidden_non_project = Setting.find_by_name("hidden_non_project") + visiable = hidden_non_project && hidden_non_project.value == "0"%> +<% unless visiable%>
        <%=l(:label_projects_management_platform)%> <%=l(:label_courses_management_platform)%> <%=l(:label_contests_management_platform)%> -
        \ No newline at end of file +
        +<% end%> \ No newline at end of file diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 17c445ae8..4ee96ee76 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -2014,6 +2014,8 @@ zh: label_recently_updated_courseware: 最近更新了课件 label_no_courses: 您没有参与任何课程，请搜索课程、加入课程，或者创建课程吧！ label_commit_failed: 提交失败 + label_recently: 最近被 + label_creat: 创建 #api end label_end_time: 截止时间 @@ -2031,4 +2033,6 @@ zh: modal_valid_unpassing: 该分班已经存在 mail_footer: 点击修改邮件发送设置 + label_show_non_project: 显示非项目信息 + label_hidden_non_project: 隐藏非项目信息 diff --git a/config/routes.rb b/config/routes.rb index c9220769c..03ed4d2ab 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -736,6 +736,7 @@ RedmineApp::Application.routes.draw do match 'settings', :controller => 'settings', :action => 'index', :via => :get match 'settings/edit', :via => [:get, :post] match 'settings/plugin/:id', :to => 'settings#plugin', :via => [:get, :post], :as => 'plugin_settings' + match 'settings/hidden_non_project', :via => [:get, :post] match 'sys/projects', :via => :get match 'sys/projects/:id/repository', :to => 'sys#create_project_repository', :via => :post diff --git a/config/settings.yml b/config/settings.yml index cd3f2974e..28d6c5dbc 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -266,6 +266,8 @@ repository_domain: default: repository.trustie.net please_chose: default: 请选择 +hidden_non_project: + default: 1 plugin_redmine_ckeditor: serialized: true default: --- !ruby/hash:ActiveSupport::HashWithIndifferentAccess diff --git a/db/migrate/20150316032155_create_discuss_demos.rb b/db/migrate/20150316032155_create_discuss_demos.rb deleted file mode 100644 index af7a2a6ed..000000000 --- a/db/migrate/20150316032155_create_discuss_demos.rb +++ /dev/null @@ -1,9 +0,0 @@ -class CreateDiscussDemos < ActiveRecord::Migration - def change - create_table :discuss_demos do |t| - t.string :title - t.text :body - t.timestamps - end - end -end diff --git a/lib/redmine.rb b/lib/redmine.rb index 6a74b4d3c..b8284ddc5 100644 --- a/lib/redmine.rb +++ b/lib/redmine.rb @@ -137,6 +137,9 @@ Redmine::AccessControl.map do |map| map.permission :paret_in_homework,{},:require => :member ,:belong_to_course => true end +# map.course_module :polls do |map| +# map.permission :view_course_polls, {:polls => [:index,:show]},:require => :member, :belong_to_course => true +# end map.course_module :boards do |map| # map.permission :manage_boards, {:boards => [:new, :create, :edit, :update, :destroy]}, :require => :member @@ -484,6 +487,7 @@ Redmine::Activity.map do |activity| activity.register :course_messages, :default => false, :class_name => 'Message' activity.register :homeworks, :class_name => 'Bid' +# activity.register :polls, :class_name => 'Poll' end Redmine::Search.map do |search| diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index 00d4e445f..cfb27e20b 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -243,7 +243,7 @@ a:hover.tijiao{ background:#0f99a9;} .members_left ul li a{ float:left; text-align:center;} .members_left ul li span{ float:left; text-align:center; color:#484747;} -.w150{ text-align:center; width:150px;} +.w150{ text-align:center; width:150px;min-height: 10px;} .f_b{ font-weight: bold;} .members_right label{ margin-left:15px;} .N_search{ height:20px; border:1px solid #999;}