diff --git a/trustie2/app/views/open_source_projects/show_analysis_tab.html.erb b/trustie2/app/views/open_source_projects/show_analysis_tab.html.erb
index 9987aa9..64c2038 100644
--- a/trustie2/app/views/open_source_projects/show_analysis_tab.html.erb
+++ b/trustie2/app/views/open_source_projects/show_analysis_tab.html.erb
@@ -1,21 +1,21 @@
-
职位需求情况
+
-
薪资情况
+
工作地点分析
-
+
-
工作经验情况
+
工作经验分析
-
相关软件情况
+
相关软件分析
@@ -385,7 +385,12 @@
text: null
},
xAxis: {
- categories: categories
+ categories: categories,
+ labels: {
+ formatter: function() {
+ return(this.value.length>20?this.value.substring(0,20) + "...":this.value);
+ }
+ }
},
yAxis: {
title: {
@@ -465,6 +470,7 @@
'<%=osp.name.to_s %>',
<% end %>
],
+
data = [
<% for i in 0..@chart8_osp.length-1 %>
{
@@ -507,7 +513,12 @@
text: null
},
xAxis: {
- categories: categories
+ categories: categories,
+ labels: {
+ formatter: function() {
+ return(this.value.length>20?this.value.substring(0,20) + "...":this.value);
+ }
+ }
},
yAxis: {
title: {
diff --git a/trustie2/app/views/open_source_projects/welcome.html.erb b/trustie2/app/views/open_source_projects/welcome.html.erb
index b170cfd..a6fce1b 100644
--- a/trustie2/app/views/open_source_projects/welcome.html.erb
+++ b/trustie2/app/views/open_source_projects/welcome.html.erb
@@ -282,7 +282,7 @@
<%###########################访问量统计代码##############################%>
diff --git a/trustie2/app/views/relative_memos/search.html.erb b/trustie2/app/views/relative_memos/search.html.erb
index e4fa16a..3ca5c13 100644
--- a/trustie2/app/views/relative_memos/search.html.erb
+++ b/trustie2/app/views/relative_memos/search.html.erb
@@ -266,9 +266,9 @@
- <%= topic.view_num+topic.view_num_ossean %>
+
- <%= content_tag('span', l(:label_view_num)) %>
+
diff --git a/trustie2/app/views/tags/_tag_name.html.erb b/trustie2/app/views/tags/_tag_name.html.erb
index a3e35a6..4a53437 100644
--- a/trustie2/app/views/tags/_tag_name.html.erb
+++ b/trustie2/app/views/tags/_tag_name.html.erb
@@ -7,18 +7,21 @@
// });
// })
function reload_tags(){
- <% @tags = obj.reload.tag_list %>
+ <% #@tags = obj.reload.tag_list %>
+ <% @tags = obj.attributes["tags"]
+ if @tags != nil && @tags.length>2
+ @tags = @tags[1,@tags.length-2].split(">,<")
+ end %>
}
-<% if object_flag == '8'%>
-<%# @tags = obj.get_tag_list%>
-<% @tags = obj.tags.limit(9)%>
-<% elsif object_flag == '10' %>
-<% @tags = obj.AllTags.limit(9) %>
-<% else %>
-<% @tags = obj.reload.tag_list %>
-<% end%>
+<% #@tags = obj.get_tag_list%>
+<% @tags = obj.attributes["tags"]
+ if @tags != nil && @tags.length>2
+ @tags = @tags[1,@tags.length-2].split(">,<")
+ end
+
+ @tags = @tags[0,9]%>
<% if non_list_all and (@tags.size > 0) %>
diff --git a/trustie2/config/database.yml.example b/trustie2/config/database.yml.example
deleted file mode 100644
index 20db70b..0000000
--- a/trustie2/config/database.yml.example
+++ /dev/null
@@ -1,53 +0,0 @@
-source ~/.rvm/scripts/rvm# Default setup is given for MySQL with ruby1.9. If you're running Redmine
-source ~/.rvm/scripts/rvm# Default setup is given for MySQL with ruby1.9. If you're running Redmine
-# with MySQL and ruby1.8, replace the adapter name with `mysql`.
-# Examples for PostgreSQL, SQLite3 and SQL Server can be found at the end.
-# Line indentation must be 2 spaces (no tabs).
-
-production:
- adapter: mysql2
- database: redmine
- host: localhost
- username: root
- password: ""
- encoding: utf8
-
-development:
- adapter: mysql2
- database: redmine_development
- host: 10.107.17.20
- username: root
- password: "1234"
- encoding: utf8
-
-# Warning: The database defined as "test" will be erased and
-# re-generated from your development database when you run "rake".
-# Do not set this db to the same as development or production.
-test:
- adapter: mysql2
- database: redmine_test
- host: 10.107.17.20
- username: root
- password: "1234"
- encoding: utf8
-
-# PostgreSQL configuration example
-#production:
-# adapter: postgresql
-# database: redmine
-# host: localhost
-# username: postgres
-# password: "postgres"
-
-# SQLite3 configuration example
-#production:
-# adapter: sqlite3
-# database: db/redmine.sqlite3
-
-# SQL Server configuration example
-#production:
-# adapter: sqlserver
-# database: redmine
-# host: localhost
-# username: jenkins
-# password: jenkins
diff --git a/trustie2/config/puma.rb b/trustie2/config/puma.rb
new file mode 100644
index 0000000..c79f9e1
--- /dev/null
+++ b/trustie2/config/puma.rb
@@ -0,0 +1,7 @@
+environment "production"
+bind "unix:///var/run/ossean.sock"
+restart_command '/var/www/ossean/trustie2/restart_puma'
+daemonize true
+pidfile "/var/tmp/pids/puma.pid"
+#stdout_redirect "/var/www/ossean/trustie2/log/stdout", "/var/www/ossean/trustie2/log/stderr"
+
diff --git a/trustie2/db/migrate/20161103014905_add_index_to_relative_memo_to_open_source_projects_tables.rb b/trustie2/db/migrate/20161103014905_add_index_to_relative_memo_to_open_source_projects_tables.rb
new file mode 100644
index 0000000..3a14750
--- /dev/null
+++ b/trustie2/db/migrate/20161103014905_add_index_to_relative_memo_to_open_source_projects_tables.rb
@@ -0,0 +1,10 @@
+class AddIndexToRelativeMemoToOpenSourceProjectsTables < ActiveRecord::Migration
+ def change
+ arr = (1..70).to_a
+ arr.each do |letter|
+ add_index "relative_memo_to_open_source_projects_#{letter}".to_sym, :osp_id, :name => "osp_id_#{letter}"
+ add_index "relative_memo_to_open_source_projects_#{letter}".to_sym, :memo_type, :name => "memo_type_#{letter}"
+ add_index "relative_memo_to_open_source_projects_#{letter}".to_sym, :created_time, :name => "created_time_#{letter}"
+ end
+ end
+end
diff --git a/trustie2/public/images/avatars/Project/no_profile.png b/trustie2/public/images/avatars/Project/no_profile.png
new file mode 100644
index 0000000..7640e01
Binary files /dev/null and b/trustie2/public/images/avatars/Project/no_profile.png differ