- <%= 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("
");
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: 代码提交频率
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/migrate/20160111071348_static_project_boards.rb b/db/migrate/20160111071348_static_project_boards.rb
new file mode 100644
index 000000000..4b82be23c
--- /dev/null
+++ b/db/migrate/20160111071348_static_project_boards.rb
@@ -0,0 +1,14 @@
+class StaticProjectBoards < ActiveRecord::Migration
+ def up
+ 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
+ end
+
+ def down
+ 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..96c6d7acb
--- /dev/null
+++ b/db/migrate/20160111071411_static_project_issues.rb
@@ -0,0 +1,13 @@
+class StaticProjectIssues < ActiveRecord::Migration
+ def up
+ Project.all.each do |project|
+ unless project.issues.nil?
+ issues_count = project.issues.count
+ project.update_attribute(:issues_count, issues_count)
+ end
+ end
+ end
+
+ def down
+ 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..f013a929d
--- /dev/null
+++ b/db/migrate/20160111071529_static_project_news.rb
@@ -0,0 +1,13 @@
+class StaticProjectNews < ActiveRecord::Migration
+ def up
+ Project.all.each do |project|
+ unless project.news.nil?
+ news_count = project.news.count
+ project.update_attribute(:news_count, news_count)
+ end
+ end
+ end
+
+ def down
+ 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..692ca68eb
--- /dev/null
+++ b/db/migrate/20160111071558_static_project_attachments.rb
@@ -0,0 +1,13 @@
+class StaticProjectAttachments < ActiveRecord::Migration
+ def up
+ Project.all.each do |project|
+ unless project.attachments.nil?
+ attachments_count = project.attachments.count
+ project.update_attribute(:attachments_count, attachments_count)
+ end
+ end
+ end
+
+ def down
+ 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..3f07cbb03
--- /dev/null
+++ b/db/migrate/20160111080914_static_project_acts.rb
@@ -0,0 +1,16 @@
+class StaticProjectActs < ActiveRecord::Migration
+ def up
+ Project.all.each do |project|
+ acts = ForgeActivity.where("project_id = ?", project.id)
+ unless acts.blank?
+ count = acts.count
+ puts project.id
+ puts "acts_count is #{count}"
+ project.update_attribute(:acts_count, count)
+ end
+ end
+ end
+
+ def down
+ 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/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 2f9378dea..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
@@ -1411,6 +1411,13 @@ ActiveRecord::Schema.define(:version => 20160108024752) 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
+ 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/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
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;