From b176670943486bd117ec0e31fda6f16586524c89 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 13 May 2020 17:08:40 +0800
Subject: [PATCH] fix error

---
 app/controllers/asks_controller.rb   | 4 ++++
 app/views/admin/asks/_index.html.erb | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/controllers/asks_controller.rb b/app/controllers/asks_controller.rb
index c36df99..6b4878e 100644
--- a/app/controllers/asks_controller.rb
+++ b/app/controllers/asks_controller.rb
@@ -190,7 +190,11 @@ class AsksController < ActionController::Base
     @group_mail = email_er.email_address
     @mail_sentdate = DateTime.now
 
+    site = Site.first
+    mail_from = site['site_settings']['service_email']
+
     email_er.email.update_attributes(
+      :mail_from=> mail_from,
       :create_user=>(current_user rescue nil),
       :mail_sentdate=>@mail_sentdate,
       :module_app=>@module_app,
diff --git a/app/views/admin/asks/_index.html.erb b/app/views/admin/asks/_index.html.erb
index f96b70b..6d5e714 100644
--- a/app/views/admin/asks/_index.html.erb
+++ b/app/views/admin/asks/_index.html.erb
@@ -28,7 +28,7 @@
           <div class="quick-edit">
             <ul class="nav nav-pills">
               <% 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>
               <% end %>
             </ul>