From 3e39eacd195c0d4b8f01cc2d07e547b040f58d38 Mon Sep 17 00:00:00 2001 From: cxt Date: Thu, 24 Dec 2015 16:45:45 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E9=80=9A=E7=9F=A5=E6=97=B6=E9=80=9A=E7=9F=A5=E6=A0=87=E9=A2=98?= =?UTF-8?q?=E6=A1=86=E8=87=AA=E5=8A=A8=E8=8E=B7=E5=8F=96=E7=84=A6=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_courses.html.erb | 2 +- config/routes.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb index b37e21895..1cb8efe01 100644 --- a/app/views/layouts/base_courses.html.erb +++ b/app/views/layouts/base_courses.html.erb @@ -154,7 +154,7 @@ <% end %> <% unless show_nav?(course_file_num) %> diff --git a/config/routes.rb b/config/routes.rb index 289c602db..d82a9de8a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -438,7 +438,7 @@ RedmineApp::Application.routes.draw do post '/courses/:id/course_activity', :to => 'courses#show', :as => 'course_activity' get '/boards/:id/boards_topic', :to =>'boards#show', :as => 'boards_topic' - match 'courses/:course_id/news/new', :to => 'news#new', :via => [:get, :post], :as => 'new_course_news' + match 'courses/:course_id/news/index', :to => 'news#index', :via => [:get, :post], :as => 'new_course_news' #added by young resources :users do From e86778a9c7e127e2cf1d7a4695ea43c779331dce Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 25 Dec 2015 10:13:29 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=B8=8D=E5=AD=98?= =?UTF-8?q?=E5=9C=A8=E7=9A=84=E7=95=99=E8=A8=80=E5=8A=A8=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../20151224090313_delete_journals_message.rb | 17 +++++++++++++++++ db/schema.rb | 3 +-- 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 db/migrate/20151224090313_delete_journals_message.rb diff --git a/db/migrate/20151224090313_delete_journals_message.rb b/db/migrate/20151224090313_delete_journals_message.rb new file mode 100644 index 000000000..4753cc8e8 --- /dev/null +++ b/db/migrate/20151224090313_delete_journals_message.rb @@ -0,0 +1,17 @@ +class DeleteJournalsMessage < ActiveRecord::Migration + def up + count = JournalsForMessage.all.count / 30 + 2 + transaction do + for i in 1 ... count do + JournalsForMessage.page(i).per(30).each do |message| + if !message.m_parent_id.nil? and message.parent.nil? + message.destroy + end + end + end + end + end + + def down + end +end diff --git a/db/schema.rb b/db/schema.rb index 52c7755e9..0758d90ed 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20151218110033) do +ActiveRecord::Schema.define(:version => 20151224090313) do create_table "activities", :force => true do |t| t.integer "act_id", :null => false @@ -1569,7 +1569,6 @@ ActiveRecord::Schema.define(:version => 20151218110033) do end add_index "student_works", ["homework_common_id", "user_id"], :name => "index_student_works_on_homework_common_id_and_user_id" - add_index "student_works", ["homework_common_id"], :name => "index" create_table "student_works_evaluation_distributions", :force => true do |t| t.integer "student_work_id" From ce5f0eb855569de0898be4e874c93b3d8234ee2a Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 25 Dec 2015 11:00:41 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=85=B3=E8=81=94=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=9A=84=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_course_homework.html.erb | 36 ++++++++++--------- .../users/_user_homework_detail.html.erb | 36 +++++++++++-------- 2 files changed, 41 insertions(+), 31 deletions(-) diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb index 32b05fe86..da05ac946 100644 --- a/app/views/users/_course_homework.html.erb +++ b/app/views/users/_course_homework.html.erb @@ -102,18 +102,22 @@
迟交扣分:<%= activity.late_penalty%>分
-
- 匿评开启时间:<%= activity.homework_detail_manual.evaluation_start%> 00:00 -
+ <% if activity.anonymous_comment == 0%> +
+ 匿评开启时间:<%= activity.homework_detail_manual.evaluation_start%> 00:00 +
+ <% end %>
缺评扣分:<%= activity.homework_detail_manual.absence_penalty%>分/作品
-
- 匿评关闭时间:<%= activity.homework_detail_manual.evaluation_end%> 23:59 -
+ <% if activity.anonymous_comment == 0%> +
+ 匿评关闭时间:<%= activity.homework_detail_manual.evaluation_end%> 23:59 +
+ <% end %>
@@ -130,27 +134,27 @@ <% project = Project.find pro.project_id %>
<% if project.is_public || User.current.member_of?(project) || User.current.admin? %> - <%= link_to image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius"),project_path(project.id,:host=>Setting.host_name),:id=>"project_img_"+project.id.to_s,:alt =>"项目头像" %> + <%= link_to image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius"),project_path(project.id,:host=>Setting.host_name),:id=>"project_img_"+project.id.to_s+"_"+activity.id.to_s,:alt =>"项目头像" %> <% else %> - <%= image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius",:id=>"project_img_"+project.id.to_s,:alt =>"项目头像") %> + <%= image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius",:id=>"project_img_"+project.id.to_s+"_"+activity.id.to_s,:alt =>"项目头像") %> <% end %> -

TimTang(组长)

-

2个月前

-
+ <% time=project.updated_on %> + <% time=ForgeActivity.where("project_id=?",project.id).last.updated_at if ForgeActivity.where("project_id=?",project.id).last %> +

<%=(User.find project.user_id).show_name %>(组长)

+

<%=time_from_now time %>

+
项目名称:<%=project.name %>
创建者:<%=(User.find project.user_id).show_name %>(组长)
- <% time=project.updated_on %> - <% time=ForgeActivity.where("project_id=?",project.id).last.updated_at if ForgeActivity.where("project_id=?",project.id).last %> 更新时间:<%=time_from_now time %>
diff --git a/app/views/users/_user_homework_detail.html.erb b/app/views/users/_user_homework_detail.html.erb index e49a7ed17..a0860dded 100644 --- a/app/views/users/_user_homework_detail.html.erb +++ b/app/views/users/_user_homework_detail.html.erb @@ -107,18 +107,22 @@
迟交扣分:<%= homework_common.late_penalty%>分
-
- 匿评开启时间:<%= homework_common.homework_detail_manual.evaluation_start%> 00:00 -
+ <% if homework_common.anonymous_comment == 0%> +
+ 匿评开启时间:<%= homework_common.homework_detail_manual.evaluation_start%> 00:00 +
+ <% end %>
缺评扣分:<%= homework_common.homework_detail_manual.absence_penalty%>分/作品
-
- 匿评关闭时间:<%= homework_common.homework_detail_manual.evaluation_end%> 23:59 -
+ <% if homework_common.anonymous_comment == 0%> +
+ 匿评关闭时间:<%= homework_common.homework_detail_manual.evaluation_end%> 23:59 +
+ <% end %>
@@ -135,24 +139,26 @@ <% project = Project.find pro.project_id %>
<% if project.is_public || User.current.member_of?(project) || User.current.admin? %> - <%= link_to image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius"),project_path(project.id,:host=>Setting.host_name),:id=>"project_img_"+project.id.to_s,:alt =>"项目头像" %> + <%= link_to image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius"),project_path(project.id,:host=>Setting.host_name),:id=>"project_img_"+project.id.to_s+"_"+homework_common.id.to_s,:alt =>"项目头像" %> <% else %> - <%= image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius",:id=>"project_img_"+project.id.to_s,:alt =>"项目头像") %> + <%= image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius",:id=>"project_img_"+project.id.to_s+"_"+homework_common.id.to_s,:alt =>"项目头像") %> <% end %> -
+ <% time=project.updated_on %> + <% time=ForgeActivity.where("project_id=?",project.id).last.updated_at if ForgeActivity.where("project_id=?",project.id).last %> +

<%=(User.find project.user_id).show_name %>(组长)

+

<%=time_from_now time %>

+
项目名称:<%=project.name %>
创建者:<%=(User.find project.user_id).show_name %>(组长)
- <% time=project.updated_on %> - <% time=ForgeActivity.where("project_id=?",project.id).last.updated_at if ForgeActivity.where("project_id=?",project.id).last %> 更新时间:<%=time_from_now time %>
From 0b42430e2d3c365e17c99ab97638a9531318525a Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 25 Dec 2015 11:10:26 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E5=8A=A8=E6=80=81=E6=97=A0=E6=B3=95=E5=9B=9E=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/comments_controller.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb index 359029517..11a788590 100644 --- a/app/controllers/comments_controller.rb +++ b/app/controllers/comments_controller.rb @@ -28,7 +28,11 @@ class CommentsController < ApplicationController @comment = Comment.new #@project ? @comment.comments = params[:comment][:comments] : @comment.comments = params[:comment] - @comment.comments = params[:comment][:comments] + if params[:user_activity_id] + @comment.comments = params[:comment] + else + @comment.comments = params[:comment][:comments] + end @comment.author = User.current if @news.comments << @comment if params[:asset_id] From aa653d558f15d9779e50516b0e6d6146b9dfc1ba Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 25 Dec 2015 11:26:48 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BD=9C=E5=93=81=E7=A1=AE=E8=AE=A4?= =?UTF-8?q?=E5=BC=B9=E6=A1=86=E7=9A=84=E6=8C=89=E9=92=AE=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/student_work/_work_information.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/student_work/_work_information.html.erb b/app/views/student_work/_work_information.html.erb index 90d749af1..bc728ca71 100644 --- a/app/views/student_work/_work_information.html.erb +++ b/app/views/student_work/_work_information.html.erb @@ -20,9 +20,9 @@
- 确  定 + 确 定 - <%= link_to("重试", retry_work_student_work_path(@student_work.id),:class => "tijiao",:style =>"margin-bottom: 15px;margin-top:15px;",:remote => true)%> + <%= link_to("重 试", retry_work_student_work_path(@student_work.id),:class => "tijiao",:style =>"margin-bottom: 15px;margin-top:15px;",:remote => true)%>
From b8d8cece02674b1cfeb16646aac9a1ef9502794c Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 25 Dec 2015 14:56:08 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=85=B3=E8=81=94=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=9A=84=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_user_homework_detail.html.erb | 2 +- public/stylesheets/courses.css | 2 +- public/stylesheets/new_user.css | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/users/_user_homework_detail.html.erb b/app/views/users/_user_homework_detail.html.erb index a0860dded..fb6ae0455 100644 --- a/app/views/users/_user_homework_detail.html.erb +++ b/app/views/users/_user_homework_detail.html.erb @@ -146,7 +146,7 @@ }); }); -
+
<% if project.is_public || User.current.member_of?(project) || User.current.admin? %> <%= link_to image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius"),project_path(project.id,:host=>Setting.host_name),:id=>"project_img_"+project.id.to_s+"_"+homework_common.id.to_s,:alt =>"项目头像" %> <% else %> diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index 463fc710a..b07e93701 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -1209,7 +1209,7 @@ a:hover.blueCir{ background:#3598db; color:#fff;} .proHelp {background:url(/images/course/hwork_icon.png) -5px -124px no-repeat; display:inline-block; width:15px; height:15px; display:inline-block;} .hworkPrName {width:110px; max-width:110px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; height:18px; line-height:18px; font-size:12px; color:#888888; text-align:center;} .mr150 {margin-right:150px;} -.relatePInfo {position:absolute; background-color:#ffffff; padding:3px 8px; white-space:nowrap; box-shadow:0px 2px 8px rgba(146, 153, 169, 0.5); z-index:999; color:#585858; cursor:pointer; display:none;} +.relatePInfo {text-align: left; position:absolute; background-color:#ffffff; padding:3px 8px; white-space:nowrap; box-shadow:0px 2px 8px rgba(146, 153, 169, 0.5); z-index:999; color:#585858; cursor:pointer; display:none;} /*上传资源弹窗*/ .resourceUploadPopup {width:400px; height:auto; border:3px solid #269ac9 !important; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-200px; z-index:1000;} diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index e73109eed..e7ac454e7 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -1387,7 +1387,7 @@ a:hover.blueCir{ background:#3598db; color:#fff;} /* @功能 定义 */ span.at {color:#269ac9;} -.relatePInfo {position:absolute; background-color:#ffffff; padding:3px 8px; white-space:nowrap; box-shadow:0px 2px 8px rgba(146, 153, 169, 0.5); z-index:999; color:#585858; cursor:pointer; display:none;} +.relatePInfo {text-align: left; position:absolute; background-color:#ffffff; padding:3px 8px; white-space:nowrap; box-shadow:0px 2px 8px rgba(146, 153, 169, 0.5); z-index:999; color:#585858; cursor:pointer; display:none;} /*问题状态图片*/ .issues{ background:url(../images/public_icon.png) -66px 5px no-repeat; width:18px; height:21px;} .duty{ background:url(../images/public_icon.png) -66px -18px no-repeat; width:18px; height:21px;}