diff --git a/app/controllers/activities_controller.rb b/app/controllers/activities_controller.rb
index 83b97f7d3..e1ec7a799 100644
--- a/app/controllers/activities_controller.rb
+++ b/app/controllers/activities_controller.rb
@@ -49,7 +49,7 @@ class ActivitiesController < ApplicationController
@activity_pages = Paginator.new @activity_count, @limit, params['page']
@offset ||= @activity_pages.offset
- @project_base_tag = params[:id]?'base_projects':'base'
+ @project_base_tag = params[:id] ? 'base_projects' : 'base'
if events.empty? || stale?(:etag => [@activity.scope, @date_to, @date_from, @with_subprojects, @author, events.first, events.size, User.current, current_language])
respond_to do |format|
format.html {
diff --git a/app/controllers/auto_completes_controller.rb b/app/controllers/auto_completes_controller.rb
index ea463e121..9e7467bfc 100644
--- a/app/controllers/auto_completes_controller.rb
+++ b/app/controllers/auto_completes_controller.rb
@@ -30,6 +30,7 @@ class AutoCompletesController < ApplicationController
@issues.compact!
end
render :layout => false
+
end
private
diff --git a/app/controllers/contests_controller.rb b/app/controllers/contests_controller.rb
index 14395ac0b..7ceb575f3 100644
--- a/app/controllers/contests_controller.rb
+++ b/app/controllers/contests_controller.rb
@@ -74,7 +74,7 @@ class ContestsController < ApplicationController
def show_contest
@user = @contest.author
- @jours = @contest.journals_for_messages.order('created_on DESC')
+ @jours = @contest.journals_for_messages.where('m_parent_id IS NULL').order('created_on DESC')
@limit = 10
@feedback_count = @jours.count
@feedback_pages = Paginator.new @feedback_count, @limit, params['page']
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index ee57935f1..d26cf698e 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -983,16 +983,17 @@ class ProjectsController < ApplicationController
end
# end
+ before_filter :toggleCourse, only: [:finishcourse, :restartcourse]
# TODO:#finishcourse and #restartcourse 没有设置权限，也就是说，任何人的调用都会关闭or重启课程。
# 最好通过用户与项目的权限解决这种事情。还没写
def finishcourse
- course_prefs = Course.find_by_extra(@project.identifier)
+ #course_prefs = Course.find_by_extra(@project.identifier)
# setup_time = Time.parse(course_prefs.setup_time)
# end_time = Time.parse(course_prefs.endup_time)
yesterday = Date.today.prev_day.to_time
- course_prefs.endup_time = yesterday
- @save_flag = course_prefs.save
+ @course_prefs.endup_time = yesterday
+ @save_flag = @course_prefs.save
respond_to do |format|
format.js
@@ -1000,11 +1001,11 @@ class ProjectsController < ApplicationController
end
def restartcourse
- course_prefs = Course.find_by_extra(@project.identifier)
+ #course_prefs = Course.find_by_extra(@project.identifier)
day = Time.parse("3000-01-01")
- course_prefs.endup_time = day
- @save_flag = course_prefs.save
+ @course_prefs.endup_time = day
+ @save_flag = @course_prefs.save
respond_to do |format|
format.js {
@@ -1014,6 +1015,13 @@ class ProjectsController < ApplicationController
end
private
+ def toggleCourse
+ @course_prefs = Course.find_by_extra(@project.identifier)
+ unless (@course_prefs.teacher == User.current || User.current.admin?)
+ render_403
+ end
+ end
+
def select_project_layout
project = Project.find_by_id(params[:id])
diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index 8da5d7c35..23351d919 100644
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -59,7 +59,13 @@ module IssuesHelper
def issue_heading(issue)
#h("#{issue.tracker} ##{issue.id}")
- h("#{issue.tracker} #{issue.source_from}")
+ #h("#{issue.tracker} #{issue.source_from}")
+ s = ''
+ s << ">>"
+ s << link_to(@issue.project.name+l(:issue_list), project_issues_path(@issue.project))
+ s << " >"
+ s << @issue.source_from
+ s.html_safe
end
def render_issue_subject_with_tree(issue)
diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index 3db787525..d8e3d29bd 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -28,20 +28,32 @@ class Mailer < ActionMailer::Base
end
# Builds a Mail::Message object used to email recipients of the added journals for message.
- #
+
+ # 留言分为直接留言，和对留言人留言的回复
+ # 字段说明在JournalsForMessage.rb
+ # 直接留言后 reply_id,m_parent_id 为空，相对应的at_user取值为nil
+
def journals_for_message_add(user, journals_for_message)
- @user = journals_for_message.user
- if journals_for_message.jour_type!="Project"&&journals_for_message.jour_type!="Bid"
- if(journals_for_message.reply_id==0)
- @mail = journals_for_message.jour
- else
- @mail = journals_for_message.at_user
- end
- @message = journals_for_message.notes
- @url = url_for(:controller => 'users', :action => 'user_newfeedback', :id => journals_for_message.jour)
- str = "#{@user} #{t(:label_leave_your_message, :locale => 'zh')}"
- mail :to => @mail.mail, :subject => str
- end
+ @user = journals_for_message.user # 留言人
+ @mail = journals_for_message.jour if journals_for_message.at_user.nil? # 留言
+ @mail = journals_for_message.at_user if journals_for_message.at_user
+ @message = journals_for_message.notes
+ @title = "#@user #{t(:label_leave_your_message, :locale => 'zh')}"
+
+ @url = case journals_for_message.jour.class.to_s.to_sym # 判断留言的对象所属类型
+ when :Bid
+ respond_url(journals_for_message.jour, anchor: "word_li_#{journals_for_message.id}")
+ when :Project
+ project_feedback_url(journals_for_message.jour, anchor: "word_li_#{journals_for_message.id}")
+ when :Contest
+ show_contest_contest_url(journals_for_message.jour, anchor: "word_li_#{journals_for_message.id}")
+ when :User
+ user_newfeedback_user_url(journals_for_message.jour, anchor: "word_li_#{journals_for_message.id}")
+ else
+ logger.error "[Builds a Mail::Message ERROR] journalsForMessage's jour is unkown type, journalsForMessage.id = #{journals_for_message.id}"
+ return -1
+ end
+ mail :to => @mail.mail, :subject => @title
end
# Builds a Mail::Message object used to email recipients of the added issue.
diff --git a/app/views/auto_completes/issues.html.erb b/app/views/auto_completes/issues.html.erb
index e292bbaeb..b097eaff4 100644
--- a/app/views/auto_completes/issues.html.erb
+++ b/app/views/auto_completes/issues.html.erb
@@ -3,5 +3,5 @@
'label' => "#{issue.tracker} ##{issue.id}: #{truncate issue.subject.to_s, :length => 60}",
'value' => issue.id
}
- }.to_json
+ }.to_json
%>
diff --git a/app/views/contests/show_contest.html.erb b/app/views/contests/show_contest.html.erb
index 9ce40bfcb..67414b0c8 100644
--- a/app/views/contests/show_contest.html.erb
+++ b/app/views/contests/show_contest.html.erb
@@ -29,6 +29,6 @@
diff --git a/app/views/courses/_set_course_time.html.erb b/app/views/courses/_set_course_time.html.erb
index d13d256c1..7f2b629c1 100644
--- a/app/views/courses/_set_course_time.html.erb
+++ b/app/views/courses/_set_course_time.html.erb
@@ -1,10 +1,13 @@
<%
id = "finish_course_#{project.id}"
- display = (project.course_extra.teacher.id == User.current.id )
+ display = (project.course_extra.teacher.id == User.current.id || User.current.admin?)
%>
-<% if display && course_endTime_timeout?(project) #如果课程已结束%>
- <%= link_to '重启课程', restartcourse_project_path(project), :remote => true, :method => :post, :id => id, :confirm => ('确定要重启课程？') %>
+<% if display #如果课程已结束%>
+ <% linkPath = course_endTime_timeout?(project) ? restartcourse_project_path(project) : finishcourse_project_path(project, format: :js) %>
+ <% desc = course_endTime_timeout?(project) ? '重启' : '关闭' %>
+
+ <%= link_to "#{desc}课程", linkPath, :remote => true, :method => :post, :id => id, :confirm => ("确定要#{desc}课程？") %>
<% else %>
- <%= link_to '关闭课程', finishcourse_project_path(project), :remote => true, :method => :post, :id => id, :confirm => ('确定要关闭课程？') %>
+
<% end %>
diff --git a/app/views/issues/_form.html.erb b/app/views/issues/_form.html.erb
index 0e3cee1ff..8f9554107 100644
--- a/app/views/issues/_form.html.erb
+++ b/app/views/issues/_form.html.erb
@@ -14,7 +14,8 @@
<% if @issue.safe_attribute? 'tracker_id' %>
<%= f.select :tracker_id, @issue.project.trackers.collect {|t| [t.name, t.id]}, {:required => true},
- :onchange => "updateIssueFrom('#{escape_javascript project_issue_form_path(@project, :id => @issue, :format => 'js')}')" %>
+ :onchange => "updateIssueFrom('#{escape_javascript project_issue_form_path(@project, :id => @issue, :format => 'js')}')" %>
+
<% end %>
diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb
index 169f1a107..6a9c4b6c8 100644
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@@ -1,4 +1,5 @@
<%# html_title "#{@issue.tracker.name} ##{@issue.id}: #{@issue.subject}" %>
+
<% html_title "#{@issue.tracker.name} #{@issue.source_from}: #{@issue.subject}" %>
<%= render :partial => 'action_menu' %>
diff --git a/app/views/projects/finishcourse.js.erb b/app/views/projects/finishcourse.js.erb
index 35ecac370..2486bfffb 100644
--- a/app/views/projects/finishcourse.js.erb
+++ b/app/views/projects/finishcourse.js.erb
@@ -4,5 +4,5 @@
<% end %>
$('#finish_course_<%=@project.id%>').replaceWith("<%= j(render partial: 'courses/set_course_time', :locals => {:project => @project} )%>")
<% else %>
- alert('设置失败，请在论坛提交问题，等待管理员处理。');
+ alert('权限不足，设置失败，请在论坛提交问题，等待管理员处理。');
<% end %>
diff --git a/app/views/school/index.html.erb b/app/views/school/index.html.erb
index 31bbc587f..06b294f89 100644
--- a/app/views/school/index.html.erb
+++ b/app/views/school/index.html.erb
@@ -76,6 +76,7 @@
+
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
index e41260de1..3fdee2a97 100644
--- a/app/views/welcome/index.html.erb
+++ b/app/views/welcome/index.html.erb
@@ -96,22 +96,28 @@
<%= link_to "我要反馈" , suggestion_send_path, {:class => 'orangeButton idea_btn', :style => "color: #EEEEEE" }%>
<%= link_to "更多>>", forums_path %>
-
- <% find_new_forum_topics(7).each do |topic|%>
-
-
-
- <%= link_to topic.subject.truncate(30, omission: '...'), topic.event_url, :class => "gray" , :style => "font-size: 10pt !important;", :target => "_blank" %>
-
-
-
<%= l(:field_updated_on) %><%=time_tag_welcome(topic_last_time topic)%>前
-
- 由 <%= link_to topic.author ? topic.author : 'Anonymous', user_path(topic.author_id), :style => "font-size: 9pt !important; color: rgb(17, 102, 173);", :target => "_blank" %> 发表
-
-
回复(<%= link_to (topic.parent ? topic.parent.replies_count : topic.replies_count), topic.event_url, :target => "_blank" %>)
+
+ <% find_new_forum_topics(7).each do |topic|%>
+
+
+ <%= link_to topic.subject.truncate(30, omission: '...'), topic.event_url,title: topic.subject %>
+
+
+
+ <%= "#{l(:label_updated_time, value: time_tag_welcome(topic_last_time topic))}".html_safe %>
+
+
+ 楼主： <%= link_to_user(topic.author) %>
+
+
+ 最后回复：<%=link_to_user topic.last_reply.try(:author) %>
+
+
+ 回复(<%= link_to topic.try(:replies_count), topic.event_url %>)
+
- <% end %>
+ <% end %>