From a24ca05157a58c6afab59a814db95ba6b83ba44b Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Mon, 21 Sep 2015 10:31:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=B4=E5=90=A7=E7=9A=84=E6=8F=8F=E8=BF=B0?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9A=84=E5=9B=BE=E6=A0=87=20=E5=92=8C=20?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=A0=87=E7=AD=BE=E7=9A=84=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E7=9A=84=E6=98=BE=E7=A4=BA=E9=9A=90=E8=97=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/forums/_forum_tag_list.html.erb |  2 ++
 app/views/layouts/base_forums.html.erb    | 11 +++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/views/forums/_forum_tag_list.html.erb b/app/views/forums/_forum_tag_list.html.erb
index 156bcc895..c0efbe4b9 100644
--- a/app/views/forums/_forum_tag_list.html.erb
+++ b/app/views/forums/_forum_tag_list.html.erb
@@ -1,5 +1,7 @@
 <% forum.tag_list.each do |tag|%>
     <span class="postlabel mr10">
                 <a href="javascript:void(0);" class="fontGrey2 mr5"><%= tag %></a>
+      <%if forum.creator.id == User.current.id%>
                 <a href="javascript:void(0);" class="fontGrey2" onclick="delete_forum_tag($(this));">×</a></span>
+       <% end %>
 <% end %>
\ No newline at end of file
diff --git a/app/views/layouts/base_forums.html.erb b/app/views/layouts/base_forums.html.erb
index ce5062fce..a03a23e7f 100644
--- a/app/views/layouts/base_forums.html.erb
+++ b/app/views/layouts/base_forums.html.erb
@@ -94,10 +94,13 @@
               <div class="fontGrey3">回答：<a href="javascript:void(0);" class="linkOrange mr5"><%= @forum.topic_count%></a> 帖子：<a href="javascript:void(0);" class="linkOrange"><%= @forum.memo_count%></a></div>
             </div>
             <div class="cl"></div>
-            <div class="fontGrey2 mt10"><span id="forum_desc_span"><%= @forum.description%></span><a href="javascript:void(0);" onclick="edit_desc();">
-              <!--<img src="<%#= Rails.root%>/images/signature_edit.png" width="12" height="12" />-->
-              <%= image_tag('signature_edit.png',{:width=>12,:height=>12})%>
-            </a>
+            <div class="fontGrey2 mt10"><span id="forum_desc_span"><%= @forum.description%></span>
+              <%if @forum.creator.id == User.current.id%>
+                  <a href="javascript:void(0);" onclick="edit_desc();">
+                  <!--<img src="<%#= Rails.root%>/images/signature_edit.png" width="12" height="12" />-->
+                  <%= image_tag('signature_edit.png',{:width=>12,:height=>12})%>
+                  </a>
+               <%end%>
             </div>
             <div class="mt15">
               <div id="forum_tag_list">