From 1e13279440c9338a67512bbb20aada364f4810be Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Sat, 20 Feb 2016 10:51:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E6=9F=A5=E7=9C=8B=E9=97=AE?=
 =?UTF-8?q?=E5=8D=B7=E8=B0=83=E6=9F=A5=E7=BB=93=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/poll/_poll.html.erb        | 7 +++++++
 app/views/poll/_poll_submit.html.erb | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/views/poll/_poll.html.erb b/app/views/poll/_poll.html.erb
index c03570072..75b07557e 100644
--- a/app/views/poll/_poll.html.erb
+++ b/app/views/poll/_poll.html.erb
@@ -58,4 +58,11 @@
         <%end%>
     <% end%>
     <li class="polls_date fr mr10"><%= format_date poll.created_at.to_date%></li>
+    <% if poll.show_result == 1 %>
+        <% if has_commit%>
+            <li><%= link_to l(:label_statistical_results), statistics_result_poll_path(poll.id), :class => "pollsbtn fr mr10"%></li>
+        <%else%>
+            <li class="pollsbtn fr mr10 pollsbtn_grey">统计结果</li>
+        <%end%>
+    <% end %>
 <% end%>
\ No newline at end of file
diff --git a/app/views/poll/_poll_submit.html.erb b/app/views/poll/_poll_submit.html.erb
index af3ca2d42..41e402dca 100644
--- a/app/views/poll/_poll_submit.html.erb
+++ b/app/views/poll/_poll_submit.html.erb
@@ -15,7 +15,7 @@
         是否确定发布该问卷？
       </p>
       <div class="polls_btn_box">
-        <%= link_to "确    定",publish_poll_poll_path(poll.id,:is_remote => is_remote), :class => "upload_btn", :onclick => "clickCanel();" %>
+        <%= link_to "确    定",publish_poll_poll_path(poll.id,:is_remote => is_remote,:show_result => show_result), :class => "upload_btn", :onclick => "clickCanel();" %>
         <a class="upload_btn upload_btn_grey" onclick="clickCanel();">
           取&nbsp;&nbsp;消
         </a>