jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

粉丝/关注列表用户时间修改，用户反馈修改普通用户能删除它们反馈！

This commit is contained in:
huangjingquan 2013-08-22 21:54:52 +08:00
parent 3e03acd391
commit 767e9b75a4
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/views/bids/_history.html.erb
View File

@ -25,10 +25,15 @@
</tr> </tr>
<tr> <tr>
<td align="left"><span class="font_lighter">发布于 <%= time_tag(journal.created_on).html_safe %>之前</span></td> <td align="left"><span class="font_lighter">发布于 <%= time_tag(journal.created_on).html_safe %>之前</span></td>
<% if @user==User.current|| User.current.admin? %>
<td width="200" align="right" class="a"><%= link_to(image_tag('comment.png'), {:controller => 'bids', :action => 'new', :id => bid, :journal_id => journal}, :remote => true, <td width="200" align="right" class="a"><%= link_to(image_tag('comment.png'), {:controller => 'bids', :action => 'new', :id => bid, :journal_id => journal}, :remote => true,
:method => 'post', :title => l(:button_quote))%> :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), <%= 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 %></td> :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 %></td>
<% else %>
<td width="200" align="right" class="a"><%= link_to(image_tag('comment.png'), {:controller => 'bids', :action => 'new', :id => bid, :journal_id => journal}, :remote => true,
:method => 'post', :title => l(:button_quote))%>
<% end %>
</tr> </tr>
</table></td> </table></td>
</tr> </tr>

2
app/views/users/user_fanslist.html.erb
View File

@ -22,7 +22,7 @@
</p></td> </p></td>
</tr> </tr>
<tr> <tr>
<td width="200" align="right" class="font_lighter"><%= l(:label_user_joinin) %><%= format_date(@user.created_on) %> <td width="200" align="right" class="font_lighter"><%= l(:label_user_joinin) %><%= format_date(user.created_on) %>
</td> </td>
</tr> </tr>
</table></td> </table></td>

2
app/views/users/user_watchlist.html.erb
View File

@ -22,7 +22,7 @@
</p></td> </p></td>
</tr> </tr>
<tr> <tr>
<td width="200" align="right" class="font_lighter"><%= l(:label_user_joinin) %><%= format_date(@user.created_on) %> <td width="200" align="right" class="font_lighter"><%= l(:label_user_joinin) %><%= format_date(user.created_on) %>
</td> </td>
</tr> </tr>
</table></td> </table></td>