diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 9572034aa..03bbcad3c 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -123,7 +123,7 @@ module ApplicationHelper CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :homework_journal_num => 1) else score = course_contributor_score.homework_journal_num.to_i + 1 - course_contributor_score.update_attributes(:homework_journal_num => score) + course_contributor_score.update_column(:homework_journal_num, score) end # 课程留言 when "Course" @@ -131,42 +131,42 @@ module ApplicationHelper CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :journal_num => 1) else score = course_contributor_score.journal_num.to_i + 1 - course_contributor_score.update_attributes(:journal_num => score) + course_contributor_score.update_column(:journal_num, score) end when "Message" if course_contributor_score.nil? CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :message_num => 1) else score = course_contributor_score.message_num.to_i + 1 - course_contributor_score.update_attributes(:message_num => score) + course_contributor_score.update_column(:message_num, score) end when "MessageReply" if course_contributor_score.nil? CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :message_reply_num => 1) else score = course_contributor_score.message_reply_num.to_i + 1 - course_contributor_score.update_attributes(:message_reply_num => score) + course_contributor_score.update_column(:message_reply_num, score) end when "NewReply" if course_contributor_score.nil? CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :news_reply_num => 1) else score = course_contributor_score.news_reply_num.to_i + 1 - course_contributor_score.update_attributes(:news_reply_num => score) + course_contributor_score.update_column(:news_reply_num, score) end when "News" if course_contributor_score.nil? CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :news_num => 1) else score = course_contributor_score.news_num.to_i + 1 - course_contributor_score.update_attributes(:news_num => score) + course_contributor_score.update_column(:news_num, score) end when "Attachment" if course_contributor_score.nil? CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :resource_num => 1) else score = course_contributor_score.resource_num.to_i + 1 - course_contributor_score.update_attributes(:resource_num => score) + course_contributor_score.update_column(:resource_num, score) end end end @@ -178,38 +178,38 @@ module ApplicationHelper when "HomeworkCommon" unless course_contributor_score.nil? score = course_contributor_score.homework_journal_num.to_i - 1 - course_contributor_score.update_attribute(:homework_journal_num, score < 0 ? 0 : score) + course_contributor_score.update_column(:homework_journal_num, score < 0 ? 0 : score) end # 课程留言 when "Course" unless course_contributor_score.nil? score = course_contributor_score.journal_num.to_i - 1 - course_contributor_score.update_attribute(:journal_num, score < 0 ? 0 : score) + course_contributor_score.update_column(:journal_num, score < 0 ? 0 : score) end when "Message" unless course_contributor_score.nil? score = course_contributor_score.message_num.to_i - 1 - course_contributor_score.update_attribute(:message_num, score < 0 ? 0 : score) + course_contributor_score.update_column(:message_num, score < 0 ? 0 : score) end when "MessageReply" unless course_contributor_score.nil? score = course_contributor_score.message_reply_num.to_i - 1 - course_contributor_score.update_attribute(:message_reply_num, score < 0 ? 0 : score) + course_contributor_score.update_column(:message_reply_num, score < 0 ? 0 : score) end when "NewReply" unless course_contributor_score.nil? score = course_contributor_score.news_reply_num.to_i - 1 - course_contributor_score.update_attribute(:news_reply_num, score < 0 ? 0 : score) + course_contributor_score.update_column(:news_reply_num, score < 0 ? 0 : score) end when "News" unless course_contributor_score.nil? score = course_contributor_score.news_num.to_i - 1 - course_contributor_score.update_attribute(:news_num, score < 0 ? 0 : score) + course_contributor_score.update_column(:news_num, score < 0 ? 0 : score) end when "Attachment" unless course_contributor_score.nil? score = course_contributor_score.resource_num.to_i - 1 - course_contributor_score.update_attribute(:resource_num, score < 0 ? 0 : score) + course_contributor_score.update_column(:resource_num, score < 0 ? 0 : score) end end end diff --git a/app/helpers/repositories_helper.rb b/app/helpers/repositories_helper.rb index 36187b460..688fd1505 100644 --- a/app/helpers/repositories_helper.rb +++ b/app/helpers/repositories_helper.rb @@ -41,6 +41,17 @@ module RepositoriesHelper identifiers.include?(iden) ? false :true end + # 获取文件目录的最新动态 + def get_trees_last_changes(project_id, rev) + g = Gitlab.client + begin + tree_changes = g.rep_last_changes(project_id, :rev => rev) + tree_changes + rescue + logger.error("faile to get tress activities!") + end + end + # 获取diff内容行号 def diff_line_num content content.scan(/@@ -(\d+),\d+ \+\d+,\d+ @@/).first.join("").to_i diff --git a/app/views/repositories/_dir_list_content.html.erb b/app/views/repositories/_dir_list_content.html.erb index dda0cddbd..e82f10689 100644 --- a/app/views/repositories/_dir_list_content.html.erb +++ b/app/views/repositories/_dir_list_content.html.erb @@ -3,6 +3,8 @@ depth = params[:depth].to_i %> <% ent_path = Redmine::CodesetUtil.replace_invalid_utf8(entry.path) %> <% ent_name = Redmine::CodesetUtil.replace_invalid_utf8(entry.name) %> +<% get_trees_last_changes(@project.id, @rev) %> +