From 0b79cbac32419b32ed7a832f821174b73136d49b Mon Sep 17 00:00:00 2001
From: fanqiang <316257774@qq.com>
Date: Thu, 22 May 2014 10:28:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B8=96=E5=AD=90=E7=9A=84?=
=?UTF-8?q?=E9=93=BE=E6=8E=A5=EF=BC=8C=E5=B8=96=E5=AD=90=E4=B8=8D=E5=9C=A8?=
=?UTF-8?q?=E8=87=AA=E5=B7=B1=E7=A4=BE=E5=8C=BA=E6=98=BE=E7=A4=BA=EF=BC=8C?=
=?UTF-8?q?=E8=80=8C=E6=98=AF=E7=9B=B4=E6=8E=A5=E9=93=BE=E6=8E=A5=E5=88=B0?=
=?UTF-8?q?=E5=85=B6=E4=BB=96=E7=9A=84=E7=BD=91=E7=AB=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/open_source_projects/_show_memo.html.erb | 7 ++++++-
app/views/open_source_projects/_show_topics.html.erb | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/app/views/open_source_projects/_show_memo.html.erb b/app/views/open_source_projects/_show_memo.html.erb
index f7027c7f2..63de42132 100644
--- a/app/views/open_source_projects/_show_memo.html.erb
+++ b/app/views/open_source_projects/_show_memo.html.erb
@@ -14,7 +14,12 @@
- <%= link_to h(topic.subject), open_source_project_relative_memo_path(open_source_project, topic) %> |
+
+ <% 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 %> |
diff --git a/app/views/open_source_projects/_show_topics.html.erb b/app/views/open_source_projects/_show_topics.html.erb
index c6df07c8e..c58f0ce22 100644
--- a/app/views/open_source_projects/_show_topics.html.erb
+++ b/app/views/open_source_projects/_show_topics.html.erb
@@ -366,7 +366,7 @@
- <%= link_to h(topic.subject), open_source_project_relative_memo_path(open_source_project, topic) %> |
+ <%= link_to h(topic.subject), topic.url %> |
| | | |