Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop

app/helpers/application_helper.rb

@@ -474,7 +474,7 @@ module ApplicationHelper
   end
   
   def user_url_and_time(user_name, user_url, created)
-    unless user_name.nil?
+    unless user_name.nil? || user_name == ''
       l(:label_added_time_by, :author => link_to(user_name, user_url), :age => time_tag(created)).html_safe
     else
       l(:label_added_time, :age => time_tag(created)).html_safe

app/models/bug_to_osp.rb

@@ -0,0 +1,3 @@
+class BugToOsp < ActiveRecord::Base
+  # attr_accessible :title, :body
+end

app/views/open_source_projects/_show_memo.html.erb

@@ -14,7 +14,12 @@
 			<td>
 			<table width="630px" border="0">
 				<tr>
-					<td valign="top" width="500px" class="<%= topic.sticky ? 'sticky' : '' %> <%= topic.locked? ? 'locked' : '' %>"><%= link_to h(topic.subject), open_source_project_relative_memo_path(open_source_project, topic) %></td>
+					<td valign="top" width="500px" class="<%= topic.sticky ? 'sticky' : '' %> <%= topic.locked? ? 'locked' : '' %>">
+						<% if topic.url.nil? || topic.url == '' %>
+						<%= link_to h(topic.subject), open_source_project_relative_memo_path(open_source_project, topic) %>
+						<% else %>
+						<%= link_to h(topic.subject), topic.url %>
+						<% end %></td>
 					<td align="right" rowspan="3">
 					<table class="borad-count">
 						<tr>
@@ -48,11 +53,11 @@
 				<tr>
 					<td colspan="2" ><span class="font_description"> </span></td>
 				</tr>
-				<!--  <tr>
+				 <tr>
-					<td align="left" colspan="2" ><span class="font_lighter"><%#= authoring topic.created_at, topic.author %>
+					<td align="left" colspan="2" ><span class="font_lighter"><%= user_url_and_time topic.username, topic.userhomeurl, topic.created_at %>
 						<br />
 					</span></td>
-				</tr>  -->
+				</tr> 
 				<tr>
 					<td align="left" colspan="2" >帖子来源：<span class="font_lighter" style="color: #068d9c"><%=link_to 'OSChina', topic.url %>
 					</span></td>

app/views/open_source_projects/_show_topics.html.erb

@@ -431,7 +431,7 @@
 			<td>
 			<table width="630px" border="0">
 				<tr>
-					<td valign="top" width="500px" class="<%= topic.sticky ? 'sticky' : '' %> <%= topic.locked? ? 'locked' : '' %>"><%= link_to h(topic.subject), open_source_project_relative_memo_path(open_source_project, topic) %></td>
+					<td valign="top" width="500px" class="<%= topic.sticky ? 'sticky' : '' %> <%= topic.locked? ? 'locked' : '' %>"><%= link_to h(topic.subject), topic.url %></td>
 					<td align="right" rowspan="3">
 					<table class="borad-count">
 						<tr>

db/migrate/20140522025137_add_topic_resource_to_relative_memo.rb

@@ -0,0 +1,5 @@
+class AddTopicResourceToRelativeMemo < ActiveRecord::Migration
+  def change
+    add_column :relative_memos, :topic_resource, :string
+  end
+end

db/migrate/20140522025721_create_bug_to_osps.rb

@@ -0,0 +1,10 @@
+class CreateBugToOsps < ActiveRecord::Migration
+  def change
+    create_table :bug_to_osps do |t|
+      t.integer :osp_id
+      t.integer :relative_memo_id
+      t.string :description
+      t.timestamps
+    end
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20140519074133) do
+ActiveRecord::Schema.define(:version => 20140522025721) do
 
   create_table "activities", :force => true do |t|
     t.integer "act_id",   :null => false
@@ -121,6 +121,14 @@ ActiveRecord::Schema.define(:version => 20140519074133) do
   add_index "boards", ["last_message_id"], :name => "index_boards_on_last_message_id"
   add_index "boards", ["project_id"], :name => "boards_project_id"
 
+  create_table "bug_to_osps", :force => true do |t|
+    t.integer  "osp_id"
+    t.integer  "relative_memo_id"
+    t.string   "description"
+    t.datetime "created_at",       :null => false
+    t.datetime "updated_at",       :null => false
+  end
+
   create_table "changes", :force => true do |t|
     t.integer "changeset_id",                               :null => false
     t.string  "action",        :limit => 1, :default => "", :null => false
@@ -699,6 +707,7 @@ ActiveRecord::Schema.define(:version => 20140519074133) do
     t.string   "username"
     t.string   "userhomeurl"
     t.date     "date_collected"
+    t.string   "topic_resource"
   end
 
   create_table "repositories", :force => true do |t|
@@ -787,6 +796,7 @@ ActiveRecord::Schema.define(:version => 20140519074133) do
     t.integer  "softapplication_id"
     t.integer  "is_public"
     t.string   "application_developers"
+    t.string   "deposit_project_url"
     t.string   "deposit_project"
   end
 

test/fixtures/bug_to_osps.yml

@@ -0,0 +1,11 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/Fixtures.html
+
+# This model initially had no columns defined.  If you add columns to the
+# model remove the '{}' from the fixture names and add the columns immediately
+# below each fixture, per the syntax in the comments below
+#
+one: {}
+# column: value
+#
+two: {}
+#  column: value

test/unit/bug_to_osp_test.rb

@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class BugToOspTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end