fix error
This commit is contained in:
parent
fa2531132d
commit
b176670943
|
@ -190,7 +190,11 @@ class AsksController < ActionController::Base
|
||||||
@group_mail = email_er.email_address
|
@group_mail = email_er.email_address
|
||||||
@mail_sentdate = DateTime.now
|
@mail_sentdate = DateTime.now
|
||||||
|
|
||||||
|
site = Site.first
|
||||||
|
mail_from = site['site_settings']['service_email']
|
||||||
|
|
||||||
email_er.email.update_attributes(
|
email_er.email.update_attributes(
|
||||||
|
:mail_from=> mail_from,
|
||||||
:create_user=>(current_user rescue nil),
|
:create_user=>(current_user rescue nil),
|
||||||
:mail_sentdate=>@mail_sentdate,
|
:mail_sentdate=>@mail_sentdate,
|
||||||
:module_app=>@module_app,
|
:module_app=>@module_app,
|
||||||
|
|
|
@ -28,7 +28,7 @@
|
||||||
<div class="quick-edit">
|
<div class="quick-edit">
|
||||||
<ul class="nav nav-pills">
|
<ul class="nav nav-pills">
|
||||||
<% if can_edit_or_delete?(b) %>
|
<% if can_edit_or_delete?(b) %>
|
||||||
<li><a href="/admin/asks/<%=b.id.to_s%>/edit"><%= t(:edit) %></a></li>
|
<li><a href="/<%= I18n.locale %>/admin/asks/<%=b.id.to_s%>/edit"><%= t(:edit) %></a></li>
|
||||||
<li><a href="#" class="delete text-error" rel="/admin/asks/<%=b.id.to_s%>"><%= t(:delete_) %></a></li>
|
<li><a href="#" class="delete text-error" rel="/admin/asks/<%=b.id.to_s%>"><%= t(:delete_) %></a></li>
|
||||||
<% end %>
|
<% end %>
|
||||||
</ul>
|
</ul>
|
||||||
|
|
Loading…
Reference in New Issue