From 767e9b75a413cef9600847a0ef5c9b512881bbae Mon Sep 17 00:00:00 2001 From: huangjingquan Date: Thu, 22 Aug 2013 21:54:52 +0800 Subject: [PATCH] =?UTF-8?q?=E7=B2=89=E4=B8=9D/=E5=85=B3=E6=B3=A8=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E7=94=A8=E6=88=B7=E6=97=B6=E9=97=B4=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=EF=BC=8C=E7=94=A8=E6=88=B7=E5=8F=8D=E9=A6=88=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=99=AE=E9=80=9A=E7=94=A8=E6=88=B7=E8=83=BD=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E5=AE=83=E4=BB=AC=E5=8F=8D=E9=A6=88=EF=BC=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/bids/_history.html.erb | 5 +++++ app/views/users/user_fanslist.html.erb | 2 +- app/views/users/user_watchlist.html.erb | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/views/bids/_history.html.erb b/app/views/bids/_history.html.erb index ebb047089..ed969df00 100644 --- a/app/views/bids/_history.html.erb +++ b/app/views/bids/_history.html.erb @@ -25,10 +25,15 @@ 发布于 <%= time_tag(journal.created_on).html_safe %>之前 + <% if @user==User.current|| User.current.admin? %> <%= link_to(image_tag('comment.png'), {:controller => 'bids', :action => 'new', :id => bid, :journal_id => journal}, :remote => true, :method => 'post', :title => l(:button_quote))%> <%= link_to(image_tag('delete.png'), {:controller => 'bids', :action => 'destroy', :object_id => journal, :id => bid},:confirm => l(:label_delete_confirm), :remote => true, :method => 'delete', :class => "delete", :confirm => l(:text_are_you_sure), :title => l(:button_delete)) if remove_allowed || journal.user_id == User.current.id %> + <% else %> + <%= link_to(image_tag('comment.png'), {:controller => 'bids', :action => 'new', :id => bid, :journal_id => journal}, :remote => true, + :method => 'post', :title => l(:button_quote))%> + <% end %> diff --git a/app/views/users/user_fanslist.html.erb b/app/views/users/user_fanslist.html.erb index 579ea42fd..01359edad 100644 --- a/app/views/users/user_fanslist.html.erb +++ b/app/views/users/user_fanslist.html.erb @@ -22,7 +22,7 @@

- <%= l(:label_user_joinin) %><%= format_date(@user.created_on) %> + <%= l(:label_user_joinin) %><%= format_date(user.created_on) %> diff --git a/app/views/users/user_watchlist.html.erb b/app/views/users/user_watchlist.html.erb index 222ac117e..1c759374a 100644 --- a/app/views/users/user_watchlist.html.erb +++ b/app/views/users/user_watchlist.html.erb @@ -22,7 +22,7 @@

- <%= l(:label_user_joinin) %><%= format_date(@user.created_on) %> + <%= l(:label_user_joinin) %><%= format_date(user.created_on) %>