diff --git a/app/views/open_source_projects/_show_memo.html.erb b/app/views/open_source_projects/_show_memo.html.erb
index 0314bd3dc..8c1cbc819 100644
--- a/app/views/open_source_projects/_show_memo.html.erb
+++ b/app/views/open_source_projects/_show_memo.html.erb
@@ -14,11 +14,11 @@
- <%= link_to h(topic.subject), open_source_project_relative_memo_path(topic.open_source_project, topic) %> |
+ <%= link_to h(topic.subject), open_source_project_relative_memo_path(open_source_project, topic) %> |
- <%= link_to (topic.replies_count), open_source_project_relative_memo_path(topic.open_source_project, topic) %> |
+ <%= link_to (topic.replies_count), open_source_project_relative_memo_path(open_source_project, topic) %> |
回帖 |
@@ -28,7 +28,7 @@
- <%= link_to (topic.viewed_count_crawl+topic.viewed_count_local), open_source_project_relative_memo_path(topic.open_source_project, topic) %> |
+ <%= link_to (topic.viewed_count_crawl+topic.viewed_count_local), open_source_project_relative_memo_path(open_source_project, topic) %> |
关注 |
@@ -38,7 +38,7 @@
- <%= link_to (topic.viewed_count_crawl+topic.viewed_count_local), open_source_project_relative_memo_path(topic.open_source_project, topic) %> |
+ <%= link_to (topic.viewed_count_crawl+topic.viewed_count_local), open_source_project_relative_memo_path(open_source_project, topic) %> |
浏览 |
diff --git a/app/views/open_source_projects/_show_topics.html.erb b/app/views/open_source_projects/_show_topics.html.erb
index 8e958101d..bd57f9742 100644
--- a/app/views/open_source_projects/_show_topics.html.erb
+++ b/app/views/open_source_projects/_show_topics.html.erb
@@ -366,11 +366,11 @@
- <%= link_to h(topic.subject), open_source_project_relative_memo_path(topic.open_source_project, topic) %> |
+ <%= link_to h(topic.subject), open_source_project_relative_memo_path(open_source_project, topic) %> |
- <%= link_to (topic.replies_count), open_source_project_relative_memo_path(topic.open_source_project, topic) %> |
+ <%= link_to (topic.replies_count), open_source_project_relative_memo_path(open_source_project, topic) %> |
回帖 |
@@ -380,7 +380,7 @@
- <%= link_to (topic.viewed_count_crawl+topic.viewed_count_local), open_source_project_relative_memo_path(topic.open_source_project, topic) %> |
+ <%= link_to (topic.viewed_count_crawl+topic.viewed_count_local), open_source_project_relative_memo_path(open_source_project, topic) %> |
关注 |
@@ -390,7 +390,7 @@
- <%= link_to (topic.viewed_count_crawl+topic.viewed_count_local), open_source_project_relative_memo_path(topic.open_source_project, topic) %> |
+ <%= link_to (topic.viewed_count_crawl+topic.viewed_count_local), open_source_project_relative_memo_path(open_source_project, topic) %> |
浏览 |
diff --git a/app/views/open_source_projects/showmemo.html.erb b/app/views/open_source_projects/showmemo.html.erb
index c439a2138..387237113 100644
--- a/app/views/open_source_projects/showmemo.html.erb
+++ b/app/views/open_source_projects/showmemo.html.erb
@@ -51,5 +51,5 @@
:title => l(:button_delete)
) if @forum.destroyable_by?(User.current) %>
-<%= render :partial => 'open_source_projects/show_memo', :locals => {:memos => @memos} %>
+<%= render :partial => 'open_source_projects/show_memo', :locals => {:memos => @memos, :open_source_project => @open_source_project} %>
\ No newline at end of file
diff --git a/db/schema.rb b/db/schema.rb
index 94206f0d4..0cb0be8cc 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 => 20140516031200) do
+ActiveRecord::Schema.define(:version => 20140519074133) do
create_table "activities", :force => true do |t|
t.integer "act_id", :null => false
@@ -23,6 +23,11 @@ ActiveRecord::Schema.define(:version => 20140516031200) do
add_index "activities", ["user_id", "act_type"], :name => "index_activities_on_user_id_and_act_type"
add_index "activities", ["user_id"], :name => "index_activities_on_user_id"
+ create_table "andoidcontests", :force => true do |t|
+ t.datetime "created_at", :null => false
+ t.datetime "updated_at", :null => false
+ end
+
create_table "apply_project_masters", :force => true do |t|
t.integer "user_id"
t.string "apply_type"
@@ -605,6 +610,14 @@ ActiveRecord::Schema.define(:version => 20140516031200) do
add_index "project_statuses", ["grade"], :name => "index_project_statuses_on_grade"
+ create_table "projecting_softapplictions", :force => true do |t|
+ t.integer "user_id"
+ t.integer "softapplication_id"
+ t.integer "project_id"
+ t.datetime "created_at", :null => false
+ t.datetime "updated_at", :null => false
+ end
+
create_table "projects", :force => true do |t|
t.string "name", :default => "", :null => false
t.text "description"
@@ -620,6 +633,7 @@ ActiveRecord::Schema.define(:version => 20140516031200) do
t.boolean "inherit_members", :default => false, :null => false
t.integer "project_type"
t.boolean "hidden_repo", :default => false, :null => false
+ t.integer "user_id"
t.integer "attachmenttype", :default => 1
end
@@ -743,10 +757,11 @@ ActiveRecord::Schema.define(:version => 20140516031200) do
t.string "url"
t.string "title"
t.integer "share_type"
- t.datetime "created_at", :null => false
- t.datetime "updated_at", :null => false
+ t.datetime "created_at", :null => false
+ t.datetime "updated_at", :null => false
t.integer "project_id"
t.integer "user_id"
+ t.string "description"
end
create_table "softapplications", :force => true do |t|
@@ -763,6 +778,7 @@ ActiveRecord::Schema.define(:version => 20140516031200) do
t.integer "is_public"
t.string "application_developers"
t.string "deposit_project_url"
+ t.string "deposit_project"
end
create_table "students_for_courses", :force => true do |t|
@@ -849,8 +865,8 @@ ActiveRecord::Schema.define(:version => 20140516031200) do
t.integer "zip_code"
t.datetime "created_at", :null => false
t.datetime "updated_at", :null => false
- t.integer "identity"
t.string "technical_title"
+ t.integer "identity"
t.string "student_id"
t.string "teacher_realname"
t.string "student_realname"
@@ -871,10 +887,8 @@ ActiveRecord::Schema.define(:version => 20140516031200) do
add_index "user_grades", ["user_id"], :name => "index_user_grades_on_user_id"
create_table "user_levels", :force => true do |t|
- t.integer "user_id"
- t.integer "level"
- t.datetime "created_at", :null => false
- t.datetime "updated_at", :null => false
+ t.integer "user_id"
+ t.integer "level"
end
create_table "user_preferences", :force => true do |t|
| | | | | | | |