From 525d1544c2c2a137e907e3e2d4d143d921f5fea1 Mon Sep 17 00:00:00 2001 From: huang Date: Mon, 11 Jan 2016 10:43:48 +0800 Subject: [PATCH 01/15] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../users/_resource_share_for_project_popup.html.erb | 8 +++----- app/views/users/search_user_project.js.erb | 9 +-------- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/app/views/users/_resource_share_for_project_popup.html.erb b/app/views/users/_resource_share_for_project_popup.html.erb index 2dba25e56..f15c29e90 100644 --- a/app/views/users/_resource_share_for_project_popup.html.erb +++ b/app/views/users/_resource_share_for_project_popup.html.erb @@ -1,10 +1,8 @@ - -
发送到
- @@ -20,13 +18,13 @@ <%= hidden_field_tag(:send_ids, send_ids) %> <%= submit_tag '',:class=>'searchIcon2',:onfocus=>"this.blur();",:style=>'border-style:none' %> <% end %>
- <%= form_tag add_exist_file_to_project_user_path(user),:remote=>true,:id=>'projects_list_form' %> + <%= form_tag add_exist_file_to_project_user_path(user), :remote => true, :id=>'projects_list_form' %>
<%= hidden_field_tag(:send_id, send_id) %> diff --git a/app/views/users/search_user_project.js.erb b/app/views/users/search_user_project.js.erb index 0632ebb98..5218c22ab 100644 --- a/app/views/users/search_user_project.js.erb +++ b/app/views/users/search_user_project.js.erb @@ -1,11 +1,4 @@ - -//var popupHeight = $(".resourceSharePopup").outerHeight(true); -//$(".resourceSharePopup").css("marginTop",-popupHeight/2); -// -//$("#upload_box").css('left','').css('top',''); -//$("#upload_box").html('<%#= escape_javascript( render :partial => "resource_share_for_project_popup" ,:locals => {:projects=>@projects,:user=>@user,:send_id=>@send_id,:send_ids=>@send_ids})%>'); -//$("#upload_box").css('display','block'); -$("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/resource_share_for_project_popup' ,:locals => {:projects=>@projects,:user=>@user,:send_id=>@send_id,:send_ids=>@send_ids})%>'); +$("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/resource_share_for_project_popup', :locals => {:projects => @projects, :user => @user, :send_id => @send_id, :send_ids => @send_ids}) %>'); showModal('ajax-modal', '452px'); $('#ajax-modal').siblings().remove(); $('#ajax-modal').before(""); From f3b732460cef51a3f58e37e035862f504a725e2d Mon Sep 17 00:00:00 2001 From: huang Date: Mon, 11 Jan 2016 14:57:52 +0800 Subject: [PATCH 02/15] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projects/_development_group.html.erb | 2 +- ...60111064927_add_issues_count_to_project.rb | 5 +++ ...065137_add_attachments_count_to_project.rb | 5 +++ ...60111065215_add_boards_count_to_project.rb | 5 +++ ...0160111065530_add_news_count_to_project.rb | 5 +++ db/schema.rb | 33 +++++++++++++++++-- 6 files changed, 51 insertions(+), 4 deletions(-) create mode 100644 db/migrate/20160111064927_add_issues_count_to_project.rb create mode 100644 db/migrate/20160111065137_add_attachments_count_to_project.rb create mode 100644 db/migrate/20160111065215_add_boards_count_to_project.rb create mode 100644 db/migrate/20160111065530_add_news_count_to_project.rb diff --git a/app/views/projects/_development_group.html.erb b/app/views/projects/_development_group.html.erb index 83b65fe90..47a1f2a94 100644 --- a/app/views/projects/_development_group.html.erb +++ b/app/views/projects/_development_group.html.erb @@ -6,7 +6,7 @@
<% unless @project.enabled_modules.where("name = 'issue_tracking'").empty? %>
- <%= link_to l(:label_issue_tracking), project_issues_path(@project), :class => "f14 c_blue02" %> + <%= link_to l(:label_issue_tracking), project_issues_path(@project, :remote => true), :class => "f14 c_blue02" %> <% if (issue_count = @project.issues.count) > 0 %> (<%= issue_count %>) <% end %> diff --git a/db/migrate/20160111064927_add_issues_count_to_project.rb b/db/migrate/20160111064927_add_issues_count_to_project.rb new file mode 100644 index 000000000..dcb90b32c --- /dev/null +++ b/db/migrate/20160111064927_add_issues_count_to_project.rb @@ -0,0 +1,5 @@ +class AddIssuesCountToProject < ActiveRecord::Migration + def change + add_column :projects, :issues_count, :integer, :default => false + end +end diff --git a/db/migrate/20160111065137_add_attachments_count_to_project.rb b/db/migrate/20160111065137_add_attachments_count_to_project.rb new file mode 100644 index 000000000..aecacfcb6 --- /dev/null +++ b/db/migrate/20160111065137_add_attachments_count_to_project.rb @@ -0,0 +1,5 @@ +class AddAttachmentsCountToProject < ActiveRecord::Migration + def change + add_column :projects, :attachments_count, :integer, :default => false + end +end diff --git a/db/migrate/20160111065215_add_boards_count_to_project.rb b/db/migrate/20160111065215_add_boards_count_to_project.rb new file mode 100644 index 000000000..efc4b3f3c --- /dev/null +++ b/db/migrate/20160111065215_add_boards_count_to_project.rb @@ -0,0 +1,5 @@ +class AddBoardsCountToProject < ActiveRecord::Migration + def change + add_column :projects, :boards_count, :integer, :default => false + end +end diff --git a/db/migrate/20160111065530_add_news_count_to_project.rb b/db/migrate/20160111065530_add_news_count_to_project.rb new file mode 100644 index 000000000..63278e2eb --- /dev/null +++ b/db/migrate/20160111065530_add_news_count_to_project.rb @@ -0,0 +1,5 @@ +class AddNewsCountToProject < ActiveRecord::Migration + def change + add_column :projects, :news_count, :integer, :default => false + end +end diff --git a/db/schema.rb b/db/schema.rb index 641f9c75c..c8d649ccd 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 => 20160108021447) do +ActiveRecord::Schema.define(:version => 20160111065530) do create_table "activities", :force => true do |t| t.integer "act_id", :null => false @@ -207,6 +207,7 @@ ActiveRecord::Schema.define(:version => 20160108021447) do t.integer "author_id" t.datetime "created_at", :null => false t.datetime "updated_at", :null => false + t.integer "homepage_id" end create_table "boards", :force => true do |t| @@ -981,13 +982,14 @@ ActiveRecord::Schema.define(:version => 20160108021447) do t.text "notes" t.integer "status" t.integer "reply_id" - t.datetime "created_on", :null => false - t.datetime "updated_on", :null => false + t.datetime "created_on", :null => false + t.datetime "updated_on", :null => false t.string "m_parent_id" t.boolean "is_readed" t.integer "m_reply_count" t.integer "m_reply_id" t.integer "is_comprehensive_evaluation" + t.integer "private", :default => 0 end create_table "kindeditor_assets", :force => true do |t| @@ -1215,6 +1217,18 @@ ActiveRecord::Schema.define(:version => 20160108021447) do t.datetime "updated_at", :null => false end + create_table "org_messages", :force => true do |t| + t.integer "user_id" + t.integer "sender_id" + t.integer "organization_id" + t.string "message_type" + t.integer "message_id" + t.integer "viewed" + t.string "content" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + create_table "org_projects", :force => true do |t| t.integer "organization_id" t.integer "project_id" @@ -1397,6 +1411,10 @@ ActiveRecord::Schema.define(:version => 20160108021447) do t.integer "forked_count" t.integer "commits_count", :default => 0 t.integer "publish_resource", :default => 0 + t.integer "issues_count", :default => 0 + t.integer "attachments_count", :default => 0 + t.integer "boards_count", :default => 0 + t.integer "news_count", :default => 0 end add_index "projects", ["lft"], :name => "index_projects_on_lft" @@ -1543,6 +1561,15 @@ ActiveRecord::Schema.define(:version => 20160108021447) do t.string "description" end + create_table "shield_activities", :force => true do |t| + t.string "container_type" + t.integer "container_id" + t.string "shield_type" + t.integer "shield_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + create_table "softapplications", :force => true do |t| t.string "name" t.text "description" From 1239a8b5af025d4fb153026ca04b13b25bdeef7a Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 12 Jan 2016 10:38:50 +0800 Subject: [PATCH 03/15] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E8=BF=81=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/project.rb | 32 +++++++++---------- .../20160111071348_static_project_boards.rb | 19 +++++++++++ .../20160111071411_static_project_issues.rb | 12 +++++++ .../20160111071529_static_project_news.rb | 12 +++++++ ...160111071558_static_project_attachments.rb | 12 +++++++ ...0160111080833_add_acts_count_to_project.rb | 5 +++ .../20160111080914_static_project_acts.rb | 12 +++++++ 7 files changed, 88 insertions(+), 16 deletions(-) create mode 100644 db/migrate/20160111071348_static_project_boards.rb create mode 100644 db/migrate/20160111071411_static_project_issues.rb create mode 100644 db/migrate/20160111071529_static_project_news.rb create mode 100644 db/migrate/20160111071558_static_project_attachments.rb create mode 100644 db/migrate/20160111080833_add_acts_count_to_project.rb create mode 100644 db/migrate/20160111080914_static_project_acts.rb diff --git a/app/models/project.rb b/app/models/project.rb index cd4036810..f17124478 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -155,7 +155,7 @@ class Project < ActiveRecord::Base # 创建project之后默认创建一个board，之后的board去掉了board的概念 after_create :create_board_sync,:acts_as_forge_activities,:create_project_ealasticsearch_index before_destroy :delete_all_members,:delete_project_ealasticsearch_index - after_update :update_project_ealasticsearch_index + # after_update :update_project_ealasticsearch_index def remove_references_before_destroy return if self.id.nil? Watcher.delete_all ['watchable_id = ?', id] @@ -1223,21 +1223,21 @@ class Project < ActiveRecord::Base self.__elasticsearch__.index_document end end - def update_project_ealasticsearch_index - if self.is_public #如果是初次更新成为公开的情况，会报错，那么这条记录尚未被索引过。没有报错就是更新的其他属性 - begin - self.__elasticsearch__.update_document - rescue => e - self.__elasticsearch__.index_document - end - else #如果是更新成为私有的，那么索引就要被删除 - begin - self.__elasticsearch__.delete_document - rescue => e - - end - end - end + # def update_project_ealasticsearch_index + # if self.is_public #如果是初次更新成为公开的情况，会报错，那么这条记录尚未被索引过。没有报错就是更新的其他属性 + # begin + # self.__elasticsearch__.update_document + # rescue => e + # self.__elasticsearch__.index_document + # end + # else #如果是更新成为私有的，那么索引就要被删除 + # begin + # self.__elasticsearch__.delete_document + # rescue => e + # + # end + # end + # end def delete_project_ealasticsearch_index begin self.__elasticsearch__.delete_document diff --git a/db/migrate/20160111071348_static_project_boards.rb b/db/migrate/20160111071348_static_project_boards.rb new file mode 100644 index 000000000..1d85860c6 --- /dev/null +++ b/db/migrate/20160111071348_static_project_boards.rb @@ -0,0 +1,19 @@ +class StaticProjectBoards < ActiveRecord::Migration + def up + begin + Project.all.each do |project| + puts project.id + unless project.boards.first.nil? + boards_count = project.boards.first.topics.count + project.update_attribute(:boards_count, boards_count) + end + end + ensure + self.down + end + end + + def down + Project.update_all(:boards_count => false) + end +end diff --git a/db/migrate/20160111071411_static_project_issues.rb b/db/migrate/20160111071411_static_project_issues.rb new file mode 100644 index 000000000..273527164 --- /dev/null +++ b/db/migrate/20160111071411_static_project_issues.rb @@ -0,0 +1,12 @@ +class StaticProjectIssues < ActiveRecord::Migration + def up + Project.all.each do |project| + issues_count = project.issues.count + project.update_attribute(:issues_count, boards_count) + end + end + + def down + Project.all.update_all(:issues_count => false) + end +end diff --git a/db/migrate/20160111071529_static_project_news.rb b/db/migrate/20160111071529_static_project_news.rb new file mode 100644 index 000000000..6ccefbc32 --- /dev/null +++ b/db/migrate/20160111071529_static_project_news.rb @@ -0,0 +1,12 @@ +class StaticProjectNews < ActiveRecord::Migration + def up + Project.all.each do |project| + news_count = project.news.count + project.update_attribute(:news_count, news_count) + end + end + + def down + Project.all.update_all(:news_count => false) + end +end diff --git a/db/migrate/20160111071558_static_project_attachments.rb b/db/migrate/20160111071558_static_project_attachments.rb new file mode 100644 index 000000000..af4a282ed --- /dev/null +++ b/db/migrate/20160111071558_static_project_attachments.rb @@ -0,0 +1,12 @@ +class StaticProjectAttachments < ActiveRecord::Migration + def up + Project.all.each do |project| + attachments_count = project.attachments.count + project.update_attribute(:attachments_count, attachments_count) + end + end + + def down + Project.all.update_all(:attachments_count => false) + end +end diff --git a/db/migrate/20160111080833_add_acts_count_to_project.rb b/db/migrate/20160111080833_add_acts_count_to_project.rb new file mode 100644 index 000000000..a990302bc --- /dev/null +++ b/db/migrate/20160111080833_add_acts_count_to_project.rb @@ -0,0 +1,5 @@ +class AddActsCountToProject < ActiveRecord::Migration + def change + add_column :projects, :acts_count, :integer, :default => false + end +end diff --git a/db/migrate/20160111080914_static_project_acts.rb b/db/migrate/20160111080914_static_project_acts.rb new file mode 100644 index 000000000..6f0d4a2e6 --- /dev/null +++ b/db/migrate/20160111080914_static_project_acts.rb @@ -0,0 +1,12 @@ +class StaticProjectActs < ActiveRecord::Migration + def up + Project.all.each do |project| + acts_count = ForgeActivity.where("project_id = ?", project.id).count + project.update_attribute(:acts_count, acts_count) + end + end + + def down + Project.all.update_all(:acts_count => false) + end +end From 500527a12d4386033ab140fcad19de6be0c1912b Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 12 Jan 2016 10:42:25 +0800 Subject: [PATCH 04/15] =?UTF-8?q?gitlab=E5=90=8C=E6=AD=A5=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/trustie/gitlab/manage_member.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/trustie/gitlab/manage_member.rb b/lib/trustie/gitlab/manage_member.rb index 433b101f5..5c75d9d6e 100644 --- a/lib/trustie/gitlab/manage_member.rb +++ b/lib/trustie/gitlab/manage_member.rb @@ -5,6 +5,8 @@ module Trustie module Gitlab module ManageMember + attr :g + include Helper def self.included(base) base.class_eval { before_create :add_gitlab_member From 83881766b2546217a26213c85f3b1d289e28b78b Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 12 Jan 2016 11:01:58 +0800 Subject: [PATCH 05/15] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=80=BB=E6=95=B0?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=8E=B7=E5=8F=96=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/repositories_controller.rb | 2 +- app/helpers/application_helper.rb | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb index 1674055ac..0f3724d6f 100644 --- a/app/controllers/repositories_controller.rb +++ b/app/controllers/repositories_controller.rb @@ -357,7 +357,7 @@ update @changesets = g.commits(@project.gpid, :ref_name => @rev) # @changesets = @repository.latest_changesets(@path, @rev) # @changesets_count = @repository.latest_changesets(@path, @rev).count - @changesets_all_count = @project.gpid.nil? ? 0 : g.commits_total_count(@project.gpid).count + @changesets_all_count = @project.gpid.nil? ? 0 : g.project(@project.gpid).commit_count @changesets_latest_coimmit = @changesets[0] @properties = @repository.properties(@path, @rev) @repositories = @project.repositories diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 9b7888bf2..4fcb43172 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -2784,8 +2784,7 @@ int main(int argc, char** argv){ #代码提交数量 def changesets_num project g = Gitlab.client - project.gpid.nil? ? 0 : g.commits_total_count(project.gpid).count - # # commits_total_count(project.gpid) + project.gpid.nil? ? 0 : g.project(project.gpid).commit_count # project.changesets.count end end From 8758235364534050144a5866acd3db1051d58308 Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 12 Jan 2016 15:10:02 +0800 Subject: [PATCH 06/15] =?UTF-8?q?issue=E5=88=9B=E5=BB=BA=E5=92=8C=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8Cissues=5Fcount+1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/issue.rb | 16 ++++++++++++++-- .../20160111071348_static_project_boards.rb | 5 ----- .../20160111071411_static_project_issues.rb | 3 +-- db/migrate/20160111071529_static_project_news.rb | 7 ++++--- .../20160111071558_static_project_attachments.rb | 7 ++++--- db/migrate/20160111080914_static_project_acts.rb | 10 +++++++--- 6 files changed, 30 insertions(+), 18 deletions(-) diff --git a/app/models/issue.rb b/app/models/issue.rb index 5ecb3e36f..4d2776ff7 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -83,9 +83,9 @@ class Issue < ActiveRecord::Base attr_reader :current_journal # fq - after_create :act_as_activity,:be_user_score_new_issue,:act_as_forge_activity, :act_as_forge_message, :act_as_at_message + after_create :act_as_activity,:be_user_score_new_issue,:act_as_forge_activity, :act_as_forge_message, :act_as_at_message, :add_issues_count after_update :be_user_score - after_destroy :down_user_score + after_destroy :down_user_score, :decrease_issues_count # after_create :be_user_score # end @@ -165,6 +165,18 @@ class Issue < ActiveRecord::Base end end + # 创建issue的时候，issues_count加1 + def add_issues_count + issue_count = self.project.issues_count + 1 + self.project.update_attribute(:issues_count, issue_count) + end + + # 删除issue的时候，issues_count减1 + def decrease_issues_count + issue_count = self.project.issues_count - 1 + self.project.update_attribute(:issues_count, issue_count) + end + # 更新缺陷 #def act_as_forge_message_update # unless self.author_id == self.assigned_to_id diff --git a/db/migrate/20160111071348_static_project_boards.rb b/db/migrate/20160111071348_static_project_boards.rb index 1d85860c6..4b82be23c 100644 --- a/db/migrate/20160111071348_static_project_boards.rb +++ b/db/migrate/20160111071348_static_project_boards.rb @@ -1,6 +1,5 @@ class StaticProjectBoards < ActiveRecord::Migration def up - begin Project.all.each do |project| puts project.id unless project.boards.first.nil? @@ -8,12 +7,8 @@ class StaticProjectBoards < ActiveRecord::Migration project.update_attribute(:boards_count, boards_count) end end - ensure - self.down - end end def down - Project.update_all(:boards_count => false) end end diff --git a/db/migrate/20160111071411_static_project_issues.rb b/db/migrate/20160111071411_static_project_issues.rb index 273527164..d9a3a24ff 100644 --- a/db/migrate/20160111071411_static_project_issues.rb +++ b/db/migrate/20160111071411_static_project_issues.rb @@ -2,11 +2,10 @@ class StaticProjectIssues < ActiveRecord::Migration def up Project.all.each do |project| issues_count = project.issues.count - project.update_attribute(:issues_count, boards_count) + project.update_attribute(:issues_count, issues_count) end end def down - Project.all.update_all(:issues_count => false) end end diff --git a/db/migrate/20160111071529_static_project_news.rb b/db/migrate/20160111071529_static_project_news.rb index 6ccefbc32..f013a929d 100644 --- a/db/migrate/20160111071529_static_project_news.rb +++ b/db/migrate/20160111071529_static_project_news.rb @@ -1,12 +1,13 @@ class StaticProjectNews < ActiveRecord::Migration def up Project.all.each do |project| - news_count = project.news.count - project.update_attribute(:news_count, news_count) + unless project.news.nil? + news_count = project.news.count + project.update_attribute(:news_count, news_count) + end end end def down - Project.all.update_all(:news_count => false) end end diff --git a/db/migrate/20160111071558_static_project_attachments.rb b/db/migrate/20160111071558_static_project_attachments.rb index af4a282ed..692ca68eb 100644 --- a/db/migrate/20160111071558_static_project_attachments.rb +++ b/db/migrate/20160111071558_static_project_attachments.rb @@ -1,12 +1,13 @@ class StaticProjectAttachments < ActiveRecord::Migration def up Project.all.each do |project| - attachments_count = project.attachments.count - project.update_attribute(:attachments_count, attachments_count) + unless project.attachments.nil? + attachments_count = project.attachments.count + project.update_attribute(:attachments_count, attachments_count) + end end end def down - Project.all.update_all(:attachments_count => false) end end diff --git a/db/migrate/20160111080914_static_project_acts.rb b/db/migrate/20160111080914_static_project_acts.rb index 6f0d4a2e6..c368507a3 100644 --- a/db/migrate/20160111080914_static_project_acts.rb +++ b/db/migrate/20160111080914_static_project_acts.rb @@ -1,12 +1,16 @@ class StaticProjectActs < ActiveRecord::Migration def up Project.all.each do |project| - acts_count = ForgeActivity.where("project_id = ?", project.id).count - project.update_attribute(:acts_count, acts_count) + acts = ForgeActivity.where("project_id = ?", project.id) + unless acts.blank? + acts_count = acts.count + puts project.id + puts "acts_count is #{acts_count}" + project.update_attribute(:acts_count, acts_count) + end end end def down - Project.all.update_all(:acts_count => false) end end From a74e5f9d308b6ff1a82d2e7cefbe218dd9146523 Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 12 Jan 2016 15:18:40 +0800 Subject: [PATCH 07/15] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=8A=A8=E6=80=81=E6=95=B0=E8=BF=81=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/migrate/20160111080914_static_project_acts.rb | 6 +++--- db/schema.rb | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/db/migrate/20160111080914_static_project_acts.rb b/db/migrate/20160111080914_static_project_acts.rb index c368507a3..3f07cbb03 100644 --- a/db/migrate/20160111080914_static_project_acts.rb +++ b/db/migrate/20160111080914_static_project_acts.rb @@ -3,10 +3,10 @@ class StaticProjectActs < ActiveRecord::Migration Project.all.each do |project| acts = ForgeActivity.where("project_id = ?", project.id) unless acts.blank? - acts_count = acts.count + count = acts.count puts project.id - puts "acts_count is #{acts_count}" - project.update_attribute(:acts_count, acts_count) + puts "acts_count is #{count}" + project.update_attribute(:acts_count, count) end end end diff --git a/db/schema.rb b/db/schema.rb index c8d649ccd..6197c2c76 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 => 20160111065530) do +ActiveRecord::Schema.define(:version => 20160111080914) do create_table "activities", :force => true do |t| t.integer "act_id", :null => false @@ -1415,6 +1415,7 @@ ActiveRecord::Schema.define(:version => 20160111065530) do t.integer "attachments_count", :default => 0 t.integer "boards_count", :default => 0 t.integer "news_count", :default => 0 + t.integer "acts_count", :default => 0 end add_index "projects", ["lft"], :name => "index_projects_on_lft" From 64088f5a212fe49584ce36bb32688dea41f3a264 Mon Sep 17 00:00:00 2001 From: huang Date: Wed, 13 Jan 2016 10:08:48 +0800 Subject: [PATCH 08/15] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=AD=98=E5=85=A5=E6=95=B0=E6=8D=AE=E5=BA=93=EF=BC=88=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E6=95=B0=E6=8D=AE=E7=9B=B4=E6=8E=A5=E4=BB=8E=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E8=8E=B7=E5=8F=96=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/files_controller.rb | 17 ++++++++-------- app/models/attachment.rb | 11 +++++++++- app/models/forge_activity.rb | 19 ++++++++++++++++-- app/models/message.rb | 20 +++++++++++++++++-- app/models/news.rb | 16 +++++++++++++-- app/views/layouts/base_projects.html.erb | 17 ++++++++-------- .../projects/_development_group.html.erb | 16 +++++++-------- app/views/projects/_friend_group.html.erb | 12 +++++------ app/views/projects/_research_team.html.erb | 16 +++++++-------- 9 files changed, 98 insertions(+), 46 deletions(-) diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb index 59b0f6f03..1506061b2 100644 --- a/app/controllers/files_controller.rb +++ b/app/controllers/files_controller.rb @@ -17,14 +17,14 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. class FilesController < ApplicationController - - layout 'base_projects' #by young + layout 'base_projects' #by young menu_item :files before_filter :auth_login1, :only => [:index] before_filter :logged_user_by_apptoken,:only => [:index] before_filter :find_project_by_project_id#, :except => [:getattachtype] - before_filter :authorize, :except => [:create,:getattachtype,:quote_resource_show,:search,:searchone4reload,:search_project,:quote_resource_show_project,:search_tag_attachment,:subfield_upload_file,:search_org_subfield_tag_attachment,:search_tag_attachment,:quote_resource_show_org_subfield,:find_org_subfield_attache,:search_files_in_subfield] + before_filter :authorize, :except => [:create,:getattachtype,:quote_resource_show,:search,:searchone4reload,:search_project,:quote_resource_show_project,:search_tag_attachment,:subfield_upload_file, + :search_org_subfield_tag_attachment,:search_tag_attachment,:quote_resource_show_org_subfield,:find_org_subfield_attache,:search_files_in_subfield] helper :sort include SortHelper @@ -450,6 +450,9 @@ class FilesController < ApplicationController end end end + # 更新资源总数, 根据上传的附件数累加 + @project.update_attribute(:attachments_count, @project.attachments_count + attachments[:files].count) + # end # TODO: 临时用 nyan sort_init 'created_on', 'desc' sort_update 'created_on' => "#{Attachment.table_name}.created_on", @@ -478,9 +481,6 @@ class FilesController < ApplicationController if !attachments.empty? && !attachments[:files].blank? && Setting.notified_events.include?('file_added') Mailer.run.attachments_added(attachments[:files]) end - # 更新课程英雄榜得分 - update_contributor_score(@course, attachments[:files].first) - # end if params[:course_attachment_type] && params[:course_attachment_type].is_a?(Array) params[:course_attachment_type].each do |type| tag_name = get_tag_name_by_type_number type @@ -502,8 +502,9 @@ class FilesController < ApplicationController end end end - - + # 更新课程英雄榜得分 + update_contributor_score(@course, attachments[:files].first) + # end # TODO: 临时用 nyan sort_init 'created_on', 'desc' sort_update 'created_on' => "#{Attachment.table_name}.created_on", diff --git a/app/models/attachment.rb b/app/models/attachment.rb index d90b0368e..3088714ee 100644 --- a/app/models/attachment.rb +++ b/app/models/attachment.rb @@ -90,7 +90,7 @@ class Attachment < ActiveRecord::Base before_save :files_to_final_location,:act_as_course_activity after_create :office_conver, :be_user_score,:act_as_forge_activity,:create_attachment_ealasticsearch_index after_update :office_conver, :be_user_score,:update_attachment_ealasticsearch_index - after_destroy :delete_from_disk,:down_user_score,:delete_attachment_ealasticsearch_index + after_destroy :delete_from_disk,:down_user_score,:delete_attachment_ealasticsearch_index#, :decrease_attchments_count # add by nwb # 获取所有可公开的资源文件列表 @@ -617,6 +617,7 @@ class Attachment < ActiveRecord::Base self.__elasticsearch__.index_document end end + def update_attachment_ealasticsearch_index if self.is_public == 1 && ( ((self.container_type == 'Project' or self.container_type == 'Version') && Project.find(self.container_id).is_public == 1) || ( self.container_type == 'Course' && Course.find(self.container_id).is_public == 1) || @@ -632,12 +633,20 @@ class Attachment < ActiveRecord::Base end end end + def delete_attachment_ealasticsearch_index begin self.__elasticsearch__.delete_document rescue => e end end + + # def decrease_attchments_count + # if self.container_type == "Project" + # count = self.container.attachments_count + # #self.container.update_attribute(:attachments_count, self.container.attachments_count - 1) + # end + # end end # Delete the previous articles index in Elasticsearch diff --git a/app/models/forge_activity.rb b/app/models/forge_activity.rb index c98c5475b..310d194a0 100644 --- a/app/models/forge_activity.rb +++ b/app/models/forge_activity.rb @@ -20,8 +20,8 @@ class ForgeActivity < ActiveRecord::Base validates :forge_act_id,presence: true validates :forge_act_type, presence: true has_many :user_acts, :class_name => 'UserAcivity',:as =>:act - after_save :add_user_activity, :add_org_activity - before_destroy :destroy_user_activity, :destroy_org_activity + after_save :add_user_activity, :add_org_activity, :add_acts_count + before_destroy :destroy_user_activity, :destroy_org_activity, :decrease_acts_count #在个人动态里面增加当前动态 def add_user_activity @@ -45,6 +45,21 @@ class ForgeActivity < ActiveRecord::Base end end + # 更新动态数 + def add_acts_count + if self.project + count = self.project.acts_count + 1 + self.project.update_attribute(:acts_count, count) + end + end + + def decrease_acts_count + if self.project + count = self.project.acts_count - 1 + self.project.update_attribute(:acts_count, count) + end + end + def add_org_activity org_activity = OrgActivity.where("org_act_type = '#{self.forge_act_type.to_s}' and org_act_id = #{self.forge_act_id}").first if org_activity diff --git a/app/models/message.rb b/app/models/message.rb index 3bb08f481..1d3ae7681 100644 --- a/app/models/message.rb +++ b/app/models/message.rb @@ -74,9 +74,9 @@ class Message < ActiveRecord::Base validates_length_of :subject, :maximum => 255 validate :cannot_reply_to_locked_topic, :on => :create - after_create :add_author_as_watcher, :reset_counters! + after_create :add_author_as_watcher, :reset_counters!, :add_boards_count after_update :update_messages_board - after_destroy :reset_counters!,:down_user_score,:delete_kindeditor_assets + after_destroy :reset_counters!,:down_user_score,:delete_kindeditor_assets, :decrease_boards_count after_create :act_as_activity,:act_as_course_activity,:be_user_score,:act_as_forge_activity, :act_as_system_message, :send_mail, :act_as_student_score, :act_as_at_message #before_save :be_user_score @@ -125,6 +125,14 @@ class Message < ActiveRecord::Base end end + # 发帖精辟更新发帖总数 + def add_boards_count + if self.parent_id.nil? + count = self.project.boards_count + 1 + self.project.update_attribute(:boards_count, count) + end + end + def reset_counters! if parent && parent.id Message.update_all({:last_reply_id => parent.children.maximum(:id)}, {:id => parent.id}) @@ -303,6 +311,14 @@ class Message < ActiveRecord::Base delete_kindeditor_assets_from_disk self.id,OwnerTypeHelper::MESSAGE end + # 删除帖子的时候更新帖子总数, 删除回复的时候总数不减少 + def decrease_boards_count + if self.parent_id.nil? + count = self.project.boards_count - 1 + self.project.update_attribute(:boards_count, count) + end + end + # 课程成员得分（英雄榜） def act_as_student_score if self.course diff --git a/app/models/news.rb b/app/models/news.rb index a7407c91f..807206f40 100644 --- a/app/models/news.rb +++ b/app/models/news.rb @@ -55,9 +55,9 @@ class News < ActiveRecord::Base :author_key => :author_id acts_as_watchable - after_create :act_as_activity,:act_as_forge_activity, :act_as_course_activity,:act_as_system_message, :add_author_as_watcher, :send_mail + after_create :act_as_activity,:act_as_forge_activity, :act_as_course_activity,:act_as_system_message, :add_author_as_watcher, :send_mail, :add_news_count - after_destroy :delete_kindeditor_assets + after_destroy :delete_kindeditor_assets, :decrease_news_count scope :visible, lambda {|*args| includes(:project).where(Project.allowed_to_condition(args.shift || User.current, :view_news, *args)) @@ -107,10 +107,17 @@ class News < ActiveRecord::Base end private + def add_news_count + if self.project + count = self.project.news_count + 1 + self.project.update_attribute(:news_count, count) + end + end def add_author_as_watcher Watcher.create(:watchable => self, :user => author) end + ## fq def act_as_activity self.acts << Activity.new(:user_id => self.author_id) @@ -161,6 +168,11 @@ class News < ActiveRecord::Base delete_kindeditor_assets_from_disk self.id,OwnerTypeHelper::NEWS end + def decrease_news_count + count = self.project.news_count - 1 + self.project.update_attribute(:news_count, count) + end + def send_mail Mailer.run.news_added(self) if Setting.notified_events.include?('news_added') end diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index 6716a3aaa..90ac0291a 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -91,12 +91,11 @@ <%= l(:label_member) %>（<%= link_to "#{@project.members.count}", project_member_path(@project), :class => 'info_foot_num c_blue', :id => 'project_members_number' %>） |  <%= l(:label_user_watcher) %>（<%= link_to "#{@project.watcher_users.count}", {:controller=>"projects", :action=>"watcherlist", :id => @project.id}, :class => 'info_foot_num c_blue' %>） - <% attaments_num = @project.attachments.count %> <% unless @project.enabled_modules.where("name = 'files'").empty? %> |  <%= l(:project_module_attachments) %>（ - <% attaments_num %> - <%= link_to "#{attaments_num}", project_files_path(@project), :class => 'info_foot_num c_blue', :id=>'project_files_count_info' %>） + <% @project.attachments_count %> + <%= link_to "#{@project.attachments_count}", project_files_path(@project), :class => 'info_foot_num c_blue', :id=>'project_files_count_info' %>） <% end %>
@@ -120,11 +119,11 @@
<% if @project.project_new_type == 1 || @project.project_new_type.nil? %> - <%= render :partial => 'projects/development_group', :locals => {:project => @project, :attaments_num => attaments_num} %> + <%= render :partial => 'projects/development_group', :locals => {:project => @project} %> <% elsif @project.project_new_type == 2 %> - <%= render :partial => 'projects/research_team', :locals => {:project => @project, :attaments_num => attaments_num} %> + <%= render :partial => 'projects/research_team', :locals => {:project => @project} %> <% else %> - <%= render :partial => 'projects/friend_group', :locals => {:project => @project, :attaments_num => attaments_num} %> + <%= render :partial => 'projects/friend_group', :locals => {:project => @project} %> <% end %>
@@ -213,19 +212,19 @@ if(data == 1) { $("#setting_project_type").replaceWith("<%= escape_javascript(project_type_link(l(:label_development_team), 1))%>"); - $("#project_memu_list").html('<%= escape_javascript(render(:partial => 'projects/development_group', :locals => {:project => @project, :attaments_num => attaments_num})) %>'); + $("#project_memu_list").html('<%= escape_javascript(render(:partial => 'projects/development_group', :locals => {:project => @project})) %>'); $("#close_light").attr("onClick","close_window('development_group');"); } else if(data == 2) { $("#setting_project_type").replaceWith("<%= escape_javascript(project_type_link(l(:label_research_group), 2))%>"); - $("#project_memu_list").html('<%= escape_javascript(render(:partial => 'projects/research_team', :locals => {:project => @project, :attaments_num => attaments_num})) %>'); + $("#project_memu_list").html('<%= escape_javascript(render(:partial => 'projects/research_team', :locals => {:project => @project})) %>'); $("#close_light").attr("onClick","close_window('research_group');"); } else if(data == 3) { $("#setting_project_type").replaceWith("<%= escape_javascript(project_type_link(l(:label_friend_organization), 3))%>"); - $("#project_memu_list").html('<%= escape_javascript(render(:partial => 'projects/friend_group', :locals => {:project => @project, :attaments_num => attaments_num})) %>'); + $("#project_memu_list").html('<%= escape_javascript(render(:partial => 'projects/friend_group', :locals => {:project => @project})) %>'); $("#close_light").attr("onClick","close_window('friend_organization');"); } else diff --git a/app/views/projects/_development_group.html.erb b/app/views/projects/_development_group.html.erb index 47a1f2a94..0c33f70a6 100644 --- a/app/views/projects/_development_group.html.erb +++ b/app/views/projects/_development_group.html.erb @@ -1,14 +1,14 @@
<%= link_to l(:label_activity), {:controller => 'projects', :action => 'show', :id => @project.id}, :class => "f14 c_blue02" %> - <% unless ForgeActivity.where("project_id = ?", @project.id).count == 0 %> - (<%= ForgeActivity.where("project_id = ?", @project.id).count %>) + <% unless @project.acts_count == 0 %> + (<%= @project.acts_count %>) <% end %>
<% unless @project.enabled_modules.where("name = 'issue_tracking'").empty? %>
<%= link_to l(:label_issue_tracking), project_issues_path(@project, :remote => true), :class => "f14 c_blue02" %> - <% if (issue_count = @project.issues.count) > 0 %> - (<%= issue_count %>) + <% if @project.issues_count > 0 %> + (<%= @project.issues_count %>) <% end %> <% if User.current.member_of?(@project) %> @@ -19,8 +19,8 @@ <% unless @project.enabled_modules.where("name = 'boards'").empty? %>
<%= link_to l(:project_module_boards), project_boards_path(@project), :class => "f14 c_blue02" %> - <% unless @project.boards.first.topics.count == 0 %> - (<%= @project.boards.first.topics.count %>) + <% unless @project.boards_count == 0 %> + (<%= @project.boards_count %>) <% end %> <% if User.current.member_of?(@project) %> <%= link_to "+"+l(:project_module_boards_post), project_boards_path(@project, :flag => true), :layout => 'base_projects', :class => "subnav_green ml105" %> @@ -30,8 +30,8 @@ <% unless @project.enabled_modules.where("name = 'files'").empty? %>
<%= link_to l(:project_module_files), project_files_path(@project), :class => "f14 c_blue02" %> - <% unless attaments_num == 0 %> - <%= link_to "(#{attaments_num})", project_files_path(@project), :class => "subnav_num c_orange",:id=>'project_files_count_nav' %> + <% unless @project.attachments_count == 0 %> + <%= link_to "(#{@project.attachments_count})", project_files_path(@project), :class => "subnav_num c_orange",:id=>'project_files_count_nav' %> <% end %> <% if User.current.member_of?(@project) %> <%#= link_to "+"+l(:label_upload_source), project_files_path(@project,:flag => true), :class => "subnav_green ml95" %> diff --git a/app/views/projects/_friend_group.html.erb b/app/views/projects/_friend_group.html.erb index bce920780..1e29c7552 100644 --- a/app/views/projects/_friend_group.html.erb +++ b/app/views/projects/_friend_group.html.erb @@ -1,14 +1,14 @@
<%= link_to l(:label_activity), {:controller => 'projects', :action => 'show', :id => @project.id}, :class => "f14 c_blue02" %> - <% unless ForgeActivity.where("project_id = ?", @project.id).count == 0 %> - (<%= ForgeActivity.where("project_id = ?", @project.id).count %>) + <% unless @project.acts_count == 0 %> + (<%= @project.acts_count %>) <% end %>
<% unless @project.enabled_modules.where("name = 'boards'").empty? %>
<%= link_to l(:project_module_boards), project_boards_path(@project), :class => "f14 c_blue02" %> - <% unless @project.boards.first.topics.count == 0 %> - (<%= @project.boards.first.topics.count %>) + <% unless @project.boards_count == 0 %> + (<%= @project.boards_count %>) <% end %> <% if User.current.member_of?(@project) %> <%= link_to "+"+l(:project_module_boards_post), project_boards_path(@project, :flag => true), :layout => 'base_projects', :class => "subnav_green ml105" %> @@ -18,8 +18,8 @@ <% unless @project.enabled_modules.where("name = 'files'").empty? %>
<%= link_to l(:project_module_files), project_files_path(@project), :class => "f14 c_blue02" %> - <% unless attaments_num == 0 %> - <%= link_to "(#{attaments_num})", project_files_path(@project), :class => "subnav_num c_orange",:id=>'project_files_count_nav' %> + <% unless @project.attachments_count == 0 %> + <%= link_to "(#{@project.attachments_count})", project_files_path(@project), :class => "subnav_num c_orange",:id=>'project_files_count_nav' %> <% end %> <% if User.current.member_of?(@project) %> <%= link_to "+"+l(:label_upload_source), project_files_path(@project,:flag => true), :class => "subnav_green ml95" %> diff --git a/app/views/projects/_research_team.html.erb b/app/views/projects/_research_team.html.erb index 128d5e827..2c5fb67c7 100644 --- a/app/views/projects/_research_team.html.erb +++ b/app/views/projects/_research_team.html.erb @@ -1,14 +1,14 @@
<%= link_to l(:label_activity), {:controller => 'projects', :action => 'show', :id => @project.id}, :class => "f14 c_blue02" %> - <% unless ForgeActivity.where("project_id = ?", @project.id).count == 0 %> - (<%= ForgeActivity.where("project_id = ?", @project.id).count %>) + <% unless @project.acts_count == 0 %> + (<%= @project.acts_count %>) <% end %>
<% unless @project.enabled_modules.where("name = 'issue_tracking'").empty? %>
<%= link_to l(:label_issue_tracking), project_issues_path(@project), :class => "f14 c_blue02" %> - <% if (issue_count = @project.issues.count) > 0 %> - (<%= issue_count %>) + <% if @project.issues_count > 0 %> + (<%= @project.issues_count %>) <% end %> <% if User.current.member_of?(@project) %> <%= link_to "+"+l(:label_release_issue), new_project_issue_path(@project) , :class => "subnav_green" %> @@ -18,8 +18,8 @@ <% unless @project.enabled_modules.where("name = 'boards'").empty? %>
<%= link_to l(:project_module_boards), project_boards_path(@project), :class => "f14 c_blue02" %> - <% unless @project.boards.first.topics.count == 0 %> - (<%= @project.boards.first.topics.count %>) + <% unless @project.boards_count == 0 %> + (<%= @project.boards_count %>) <% end %> <% if User.current.member_of?(@project) %> <%= link_to "+"+l(:project_module_boards_post), project_boards_path(@project, :flag => true), :layout => 'base_projects', :class => "subnav_green ml105" %> @@ -29,8 +29,8 @@ <% unless @project.enabled_modules.where("name = 'files'").empty? %>
<%= link_to l(:project_module_files), project_files_path(@project), :class => "f14 c_blue02" %> - <% unless attaments_num == 0 %> - <%= link_to "(#{attaments_num})", project_files_path(@project), :class => "subnav_num c_orange",:id=>'project_files_count_nav' %> + <% unless @project.attachments_count == 0 %> + <%= link_to "(#{@project.attachments_count})", project_files_path(@project), :class => "subnav_num c_orange",:id=>'project_files_count_nav' %> <% end %> <% if User.current.member_of?(@project) %> <%= link_to "+"+l(:label_upload_source), project_files_path(@project,:flag => true), :class => "subnav_green ml95" %> From 5519ef78e2b5206b33792656bd8e92368dfd0763 Mon Sep 17 00:00:00 2001 From: huang Date: Wed, 13 Jan 2016 10:18:19 +0800 Subject: [PATCH 09/15] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=96=B0=E9=97=BB?= =?UTF-8?q?=E3=80=81=E9=A1=B9=E7=9B=AE=E8=AE=A8=E8=AE=BA=E5=8C=BA=E5=8C=BA?= =?UTF-8?q?=E5=88=86project=E5=92=8Ccourse?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/message.rb | 4 ++-- app/models/news.rb | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/models/message.rb b/app/models/message.rb index 1d3ae7681..c43657aa5 100644 --- a/app/models/message.rb +++ b/app/models/message.rb @@ -127,7 +127,7 @@ class Message < ActiveRecord::Base # 发帖精辟更新发帖总数 def add_boards_count - if self.parent_id.nil? + if self.project && self.parent_id.nil? count = self.project.boards_count + 1 self.project.update_attribute(:boards_count, count) end @@ -313,7 +313,7 @@ class Message < ActiveRecord::Base # 删除帖子的时候更新帖子总数, 删除回复的时候总数不减少 def decrease_boards_count - if self.parent_id.nil? + if self.project && self.parent_id.nil? count = self.project.boards_count - 1 self.project.update_attribute(:boards_count, count) end diff --git a/app/models/news.rb b/app/models/news.rb index 807206f40..14e570286 100644 --- a/app/models/news.rb +++ b/app/models/news.rb @@ -169,8 +169,10 @@ class News < ActiveRecord::Base end def decrease_news_count - count = self.project.news_count - 1 - self.project.update_attribute(:news_count, count) + if self.project + count = self.project.news_count - 1 + self.project.update_attribute(:news_count, count) + end end def send_mail From a0ceb9b11c4564afb9ec7accc1c4373fdc1b9718 Mon Sep 17 00:00:00 2001 From: huang Date: Wed, 13 Jan 2016 12:53:09 +0800 Subject: [PATCH 10/15] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BC=BA=E9=99=B7?= =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E7=BB=9F=E8=AE=A1=20=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=BA=93=E6=8F=90=E4=BA=A4=E6=AC=A1=E6=95=B0?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/journal.rb | 20 +++++++++++++++++-- .../20160111071411_static_project_issues.rb | 6 ++++-- ...113023045_add_journals_count_to_project.rb | 5 +++++ .../20160113023137_statics_issue_journal.rb | 12 +++++++++++ ...160113024927_statics_repository_commits.rb | 19 ++++++++++++++++++ db/schema.rb | 3 ++- 6 files changed, 60 insertions(+), 5 deletions(-) create mode 100644 db/migrate/20160113023045_add_journals_count_to_project.rb create mode 100644 db/migrate/20160113023137_statics_issue_journal.rb create mode 100644 db/migrate/20160113024927_statics_repository_commits.rb diff --git a/app/models/journal.rb b/app/models/journal.rb index e1464a703..62f0d1d69 100644 --- a/app/models/journal.rb +++ b/app/models/journal.rb @@ -48,14 +48,14 @@ class Journal < ActiveRecord::Base :conditions => "#{Journal.table_name}.journalized_type = 'Issue' AND" + "(#{JournalDetail.table_name}.prop_key = 'status_id' OR #{Journal.table_name}.notes <> '')"} - before_create :split_private_notes + before_create :split_private_notes, :add_journals_count # fq after_save :act_as_activity,:be_user_score, :act_as_forge_message, :act_as_at_message # end #after_destroy :down_user_score #before_save :be_user_score - after_destroy :down_user_score + after_destroy :down_user_score, :decrease_issues_journal_count scope :visible, lambda {|*args| user = args.shift || User.current @@ -214,4 +214,20 @@ class Journal < ActiveRecord::Base end end + + # 减少留言数量统计 + def decrease_issues_journal_count + unless self.issue.project.nil? + project = self.issue.project + project.update_attribute(:journals_count, project.journals_count - 1) + end + end + + # issue留言总数更新 + def add_journals_count + unless self.issue.project.nil? && self.journalized_type == "Issue" + project = self.issue.project + project.update_attribute(:journals_count, project.journals_count + 1) + end + end end diff --git a/db/migrate/20160111071411_static_project_issues.rb b/db/migrate/20160111071411_static_project_issues.rb index d9a3a24ff..96c6d7acb 100644 --- a/db/migrate/20160111071411_static_project_issues.rb +++ b/db/migrate/20160111071411_static_project_issues.rb @@ -1,8 +1,10 @@ class StaticProjectIssues < ActiveRecord::Migration def up Project.all.each do |project| - issues_count = project.issues.count - project.update_attribute(:issues_count, issues_count) + unless project.issues.nil? + issues_count = project.issues.count + project.update_attribute(:issues_count, issues_count) + end end end diff --git a/db/migrate/20160113023045_add_journals_count_to_project.rb b/db/migrate/20160113023045_add_journals_count_to_project.rb new file mode 100644 index 000000000..9548f49c4 --- /dev/null +++ b/db/migrate/20160113023045_add_journals_count_to_project.rb @@ -0,0 +1,5 @@ +class AddJournalsCountToProject < ActiveRecord::Migration + def change + add_column :projects, :journals_count, :integer, :default => false + end +end diff --git a/db/migrate/20160113023137_statics_issue_journal.rb b/db/migrate/20160113023137_statics_issue_journal.rb new file mode 100644 index 000000000..ef54c04be --- /dev/null +++ b/db/migrate/20160113023137_statics_issue_journal.rb @@ -0,0 +1,12 @@ +class StaticsIssueJournal < ActiveRecord::Migration + def up + Project.all.each do |project| + if !project.project_score.nil? && !project.project_score.issue_journal_num.nil? + project.update_attribute(:journals_count, project.project_score.issue_journal_num) + end + end + end + + def down + end +end diff --git a/db/migrate/20160113024927_statics_repository_commits.rb b/db/migrate/20160113024927_statics_repository_commits.rb new file mode 100644 index 000000000..66fa896af --- /dev/null +++ b/db/migrate/20160113024927_statics_repository_commits.rb @@ -0,0 +1,19 @@ +class StaticsRepositoryCommits < ActiveRecord::Migration + def up + g = Gitlab.client + Project.all.each do |project| + unless project.gpid.nil? + begin + puts project.id + count = g.project(project.gpid).commit_count + rescue + logger.error("The project's rep is not exit!") + end + project.update_attribute(:commits_count, count) + end + end + end + + def down + end +end diff --git a/db/schema.rb b/db/schema.rb index 6197c2c76..0009b881e 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 => 20160111080914) do +ActiveRecord::Schema.define(:version => 20160113023137) do create_table "activities", :force => true do |t| t.integer "act_id", :null => false @@ -1416,6 +1416,7 @@ ActiveRecord::Schema.define(:version => 20160111080914) do t.integer "boards_count", :default => 0 t.integer "news_count", :default => 0 t.integer "acts_count", :default => 0 + t.integer "journals_count", :default => 0 end add_index "projects", ["lft"], :name => "index_projects_on_lft" From cf7130a3983c74ebc670e1e83f4bd3fbb9d80bdd Mon Sep 17 00:00:00 2001 From: huang Date: Wed, 13 Jan 2016 12:57:09 +0800 Subject: [PATCH 11/15] 0 --- db/schema.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/schema.rb b/db/schema.rb index 0009b881e..72a6bef89 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 => 20160113023137) do +ActiveRecord::Schema.define(:version => 20160113024927) do create_table "activities", :force => true do |t| t.integer "act_id", :null => false From 05cf2d24dc18f5ad69896b3aae86d9933fa1afe9 Mon Sep 17 00:00:00 2001 From: huang Date: Wed, 13 Jan 2016 15:29:29 +0800 Subject: [PATCH 12/15] =?UTF-8?q?=E6=96=B0=E9=A1=B9=E7=9B=AE=E7=A7=AF?= =?UTF-8?q?=E5=88=86=E7=B3=BB=E7=BB=9F=20=E8=AE=A8=E8=AE=BA=E5=8C=BA?= =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E5=8A=A0=E5=85=A5=E5=BE=97=E5=88=86=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=20=E7=89=88=E6=9C=AC=E5=BA=93=E8=A1=8C=E5=8F=B7?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/application_helper.rb | 6 +++++ app/models/message.rb | 22 ++++++++++++++----- app/views/layouts/base_projects.html.erb | 11 +++++----- ...113063514_add_messages_count_to_project.rb | 5 +++++ .../20160113064153_statics_boards_reply.rb | 14 ++++++++++++ db/schema.rb | 3 ++- public/stylesheets/scm.css | 1 + 7 files changed, 51 insertions(+), 11 deletions(-) create mode 100644 db/migrate/20160113063514_add_messages_count_to_project.rb create mode 100644 db/migrate/20160113064153_statics_boards_reply.rb diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 4fcb43172..4b7820037 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -49,6 +49,12 @@ module ApplicationHelper end end + # 获取项目/课程总分 + # 发布缺陷 4分 回复缺陷 1分 提交一次 4分 讨论帖子 2分 回复帖子 1分 发布新闻 1分 + def static_project_score obj + score = obj.issues_count * 4 + obj.journals_count + obj.commits_count * 4 + obj.boards_count * 2 + obj.boards_reply_count + obj.news_count + end + # 获取组织成员中文名字 def get_org_member_role_name member case member.roles[0].name diff --git a/app/models/message.rb b/app/models/message.rb index c43657aa5..a133ecdfc 100644 --- a/app/models/message.rb +++ b/app/models/message.rb @@ -127,9 +127,15 @@ class Message < ActiveRecord::Base # 发帖精辟更新发帖总数 def add_boards_count - if self.project && self.parent_id.nil? - count = self.project.boards_count + 1 - self.project.update_attribute(:boards_count, count) + if self.project + # 讨论区 + if self.parent_id.nil? + count = self.project.boards_count + 1 + self.project.update_attribute(:boards_count, count) + else # 回复 + count = self.project.boards_reply_count + 1 + self.project.update_attribute(:boards_reply_count, count) + end end end @@ -314,8 +320,14 @@ class Message < ActiveRecord::Base # 删除帖子的时候更新帖子总数, 删除回复的时候总数不减少 def decrease_boards_count if self.project && self.parent_id.nil? - count = self.project.boards_count - 1 - self.project.update_attribute(:boards_count, count) + # 讨论区 + if self.parent_id.nil? + count = self.project.boards_count - 1 + self.project.update_attribute(:boards_count, count) + else # 回复 + count = self.project.boards_reply_count - 1 + self.project.update_attribute(:boards_reply_count, count) + end end end diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index 8bee1b7e2..8ecc6fb54 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -76,12 +76,13 @@
<% if @project.project_type == 0 %> - <% unless project_scores(@project) == 0 %> + <% unless static_project_score(@project) == 0 %> <%= l(:label_project_score)%> : - <%= link_to(format("%.2f" ,project_scores(@project) ).to_i, {:controller => 'projects', - :action => 'show_projects_score', - :remote => true, - :id => @project.id}, :class => "c_orange f14" ) %> + <%= link_to(format("%.2f" ,static_project_score(@project) ).to_i, + {:controller => 'projects', + :action => 'show_projects_score', + :remote => true, + :id => @project.id}, :class => "c_orange f14" ) %> <% end %> <% end %>
diff --git a/db/migrate/20160113063514_add_messages_count_to_project.rb b/db/migrate/20160113063514_add_messages_count_to_project.rb new file mode 100644 index 000000000..218ac3cc4 --- /dev/null +++ b/db/migrate/20160113063514_add_messages_count_to_project.rb @@ -0,0 +1,5 @@ +class AddMessagesCountToProject < ActiveRecord::Migration + def change + add_column :projects, :boards_reply_count, :integer, :default => false + end +end diff --git a/db/migrate/20160113064153_statics_boards_reply.rb b/db/migrate/20160113064153_statics_boards_reply.rb new file mode 100644 index 000000000..baf427b10 --- /dev/null +++ b/db/migrate/20160113064153_statics_boards_reply.rb @@ -0,0 +1,14 @@ +class StaticsBoardsReply < ActiveRecord::Migration + def up + Project.all.each do |project| + puts project.id + unless project.boards.first.nil? + messages_count = Message.where("board_id =? and parent_id is not ?", project.boards.first.id, nil).count + project.update_attribute(:boards_reply_count, messages_count) + end + end + end + + def down + end +end diff --git a/db/schema.rb b/db/schema.rb index fc3762bd1..5079e6655 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 => 20160108024752) do +ActiveRecord::Schema.define(:version => 20160113064153) do create_table "activities", :force => true do |t| t.integer "act_id", :null => false @@ -1417,6 +1417,7 @@ ActiveRecord::Schema.define(:version => 20160108024752) do t.integer "news_count", :default => 0 t.integer "acts_count", :default => 0 t.integer "journals_count", :default => 0 + t.integer "boards_reply_count", :default => 0 end add_index "projects", ["lft"], :name => "index_projects_on_lft" diff --git a/public/stylesheets/scm.css b/public/stylesheets/scm.css index 054b0bf99..b8b624154 100644 --- a/public/stylesheets/scm.css +++ b/public/stylesheets/scm.css @@ -52,6 +52,7 @@ table.filecontent th.line-num { -ms-user-select: none; -webkit-user-select: none; font-weight:normal; + white-space: nowrap; } table.filecontent th.line-num a { text-decoration: none; From 7697dadbead2455a740344537e255a1346b89014 Mon Sep 17 00:00:00 2001 From: huang Date: Wed, 13 Jan 2016 15:50:55 +0800 Subject: [PATCH 13/15] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=BA=93=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E6=AC=A1=E6=95=B0=E5=88=B7=E6=96=B0=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=BA=93=E7=9A=84=E6=97=B6=E5=80=99=E8=87=AA=E5=8A=A8=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/repositories_controller.rb | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb index 0f3724d6f..4d407e35e 100644 --- a/app/controllers/repositories_controller.rb +++ b/app/controllers/repositories_controller.rb @@ -344,20 +344,15 @@ update #Modified by young # (show_error_not_found; return) unless @entries g = Gitlab.client - - # count = 0 - # (0..100).each do |page| - # if g.commits(@project.gpid,:page => page).count == 0 - # break - # else - # count = count + g.commits(@project.gpid,:page => page).count - # end - # end - @changesets = g.commits(@project.gpid, :ref_name => @rev) # @changesets = @repository.latest_changesets(@path, @rev) # @changesets_count = @repository.latest_changesets(@path, @rev).count @changesets_all_count = @project.gpid.nil? ? 0 : g.project(@project.gpid).commit_count + # 访问该页面的是会后则刷新 + if @changesets_all_count != @project.commits_count && @changesets_all_count != 0 + update_commits_count(@project, @changesets_all_count) + end + # end @changesets_latest_coimmit = @changesets[0] @properties = @repository.properties(@path, @rev) @repositories = @project.repositories @@ -583,6 +578,10 @@ update end private + # 更新项目统计数 + def update_commits_count project, count + project.update_attribute(:commits_count, count) + end def find_repository @repository = Repository.find(params[:id]) From 24df6d30d696b1f833a162168db5a40d4a4144c3 Mon Sep 17 00:00:00 2001 From: huang Date: Wed, 13 Jan 2016 16:15:46 +0800 Subject: [PATCH 14/15] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BE=97=E5=88=86?= =?UTF-8?q?=E5=BC=B9=E5=87=BA=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/application_helper.rb | 2 +- .../projects/_project_score_index.html.erb | 17 +++-- .../projects/_show_projects_score.html.erb | 63 ++++--------------- config/locales/projects/zh.yml | 2 + 4 files changed, 23 insertions(+), 61 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 4b7820037..246dae511 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -52,7 +52,7 @@ module ApplicationHelper # 获取项目/课程总分 # 发布缺陷 4分 回复缺陷 1分 提交一次 4分 讨论帖子 2分 回复帖子 1分 发布新闻 1分 def static_project_score obj - score = obj.issues_count * 4 + obj.journals_count + obj.commits_count * 4 + obj.boards_count * 2 + obj.boards_reply_count + obj.news_count + score = obj.issues_count * 4 + obj.journals_count + obj.commits_count * 4 + obj.boards_count * 2 + obj.boards_reply_count + obj.news_count + obj.attachments_count * 5 end # 获取组织成员中文名字 diff --git a/app/views/projects/_project_score_index.html.erb b/app/views/projects/_project_score_index.html.erb index f10c6b3e7..beff3552e 100644 --- a/app/views/projects/_project_score_index.html.erb +++ b/app/views/projects/_project_score_index.html.erb @@ -1,10 +1,9 @@ - -
<%= l(:label_projects_score) %>
-
= <%= l(:label_issue_score) %> + <%= l(:label_news_score) %> + <%= l(:label_file_score) %> + - <%= l(:label_code_submit_score) %> + <%= l(:label_topic_score) %>
-
= <%= format("%.2f" , issue_score(project)).to_i %> + <%= format("%.2f" , news_score(project)).to_i %> + - <%= format("%.2f" , documents_score(project)).to_i %> + <%= format("%.2f" , changesets_score(project)).to_i %> + - <%= format("%.2f" , board_message_score(project)).to_i %>
-
= <%= format("%.2f" , project_scores(project)).to_i %>
- \ No newline at end of file +
= <%= l(:label_code_submit_score) %> + <%= l(:label_issue_score) %> + <%= l(:label_file_attachment_score) %> + <%= l(:label_topic_score) %> + <%= l(:label_news_score) %>
+
= <%= @project.commits_count * 4 %> + + <%= @project.issues_count * 4 + @project.journals_count %> + + <%= @project.attachments_count * 5 %> + + <%= @project.boards_count * 2 + @project.boards_reply_count %> + + <%= @project.news_count %> +
+
= <%= static_project_score(@project) %>
diff --git a/app/views/projects/_show_projects_score.html.erb b/app/views/projects/_show_projects_score.html.erb index 68ba2f12a..b70a49f80 100644 --- a/app/views/projects/_show_projects_score.html.erb +++ b/app/views/projects/_show_projects_score.html.erb @@ -1,5 +1,3 @@ - -

<%= l(:label_projects_score) %>

@@ -21,65 +19,28 @@
- -
  • - <%= link_to l(:label_projects_score),"javascript:void(0)", :onclick => "show_div('project_score_index')"%> : - <%= format("%.2f" , project_scores(@project) ).to_i %> -
    • -
  • - <%= link_to l(:label_issue_score), "javascript:void(0)", :onclick => "show_div('issue_score_index')"%> : - <%= format("%.2f" , issue_score(@project)).to_i %> + <%= link_to l(:label_projects_score),"javascript:void(0)", :onclick => "show_div('project_score_index')"%> : <%= static_project_score(@project) %>
    • +
  • + <%= link_to l(:label_code_submit_score), "javascript:void(0)", :onclick => "show_div('code_submit_score_index')" %> : <%= @project.commits_count * 4 %> +
  • - <%= link_to l(:label_news_score), "javascript:void(0)", :onclick => "show_div('news_score_index')"%> : - <%= format("%.2f" , news_score(@project)).to_i %> + <%= link_to l(:label_issue_score), "javascript:void(0)", :onclick => "show_div('issue_score_index')"%> : <%= @project.issues_count * 4 + @project.journals_count %>
    • -
  • - <%= link_to l(:label_file_score), "javascript:void(0)", :onclick => "show_div('file_score_index')"%> : - <%= format("%.2f" , documents_score(@project)).to_i %> -
    • -
  • - <%= link_to l(:label_code_submit_score), "javascript:void(0)", :onclick => "show_div('code_submit_score_index')" %> : - <%= format("%.2f" , changesets_score(@project)).to_i %> +
  • + <%= link_to l(:label_file_attachment_score), "javascript:void(0)", :onclick => "show_div('issue_score_index')"%> : <%= @project.attachments_count * 5 %>
    • +
  • + <%= link_to l(:label_topic_score), "javascript:void(0)", :onclick => "show_div('projects_topic_score_index')"%> : <%= @project.boards_count * 2 + @project.boards_reply_count %> +
  • - <%= link_to l(:label_topic_score), "javascript:void(0)", :onclick => "show_div('projects_topic_score_index')"%> : - <%= format("%.2f" , board_message_score(@project)).to_i %> + <%= link_to l(:label_news_score), "javascript:void(0)", :onclick => "show_div('news_score_index')"%> : <%= @project.news_count %>
<%= render :partial => 'projects/project_score_index', :locals => {:project => @project } %> -
- \ No newline at end of file +
\ No newline at end of file diff --git a/config/locales/projects/zh.yml b/config/locales/projects/zh.yml index 3f86b4b60..fe89e64e3 100644 --- a/config/locales/projects/zh.yml +++ b/config/locales/projects/zh.yml @@ -432,6 +432,8 @@ zh: label_file_score: 文档得分 label_file_number: 文档的数量 + + label_file_attachment_score: 资源得分 label_code_submit_score: 代码提交得分 label_code_submit_number: 代码提交频率 From 8f989a962d19d68b21fd098d44d5ba7286a79287 Mon Sep 17 00:00:00 2001 From: huang Date: Wed, 13 Jan 2016 16:22:25 +0800 Subject: [PATCH 15/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E6=80=BB=E5=88=86=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/projects/_show_projects_score.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/projects/_show_projects_score.html.erb b/app/views/projects/_show_projects_score.html.erb index b70a49f80..c188bad98 100644 --- a/app/views/projects/_show_projects_score.html.erb +++ b/app/views/projects/_show_projects_score.html.erb @@ -12,7 +12,7 @@ - +
<%= l(:label_projects_score) %>
<%= format("%.2f" , project_scores(@project) ).to_i %>
<%= static_project_score(@project) %>