From d56d52828b5a645a0d06a5b6e57073cd24063a79 Mon Sep 17 00:00:00 2001 From: Spen Date: Fri, 19 Jul 2013 14:40:45 +0800 Subject: [PATCH] ntue emailer app and bulletin app mail send fix --- .../back_end/approvals_controller.rb | 6 ++- .../back_end/bulletins_controller.rb | 25 +++++---- .../announcement/app/models/bulletin.rb | 26 +++++++++ .../approvals/_modal_approve.html.erb | 6 +++ .../back_end/bulletins/_form.html.erb | 2 +- .../er_email/back_end/approvals_controller.rb | 7 ++- .../er_email/back_end/email_ers_controller.rb | 54 ++++++++++++++----- .../er_email/app/models/email_er.rb | 2 + .../approvals/_modal_approve.html.erb | 8 ++- .../back_end/email_ers/_email_er.html.erb | 8 +-- .../back_end/email_ers/_form.html.erb | 21 +------- .../back_end/email_ers/_sort_headers.html.erb | 3 +- .../back_end/email_ers/index.html.erb | 1 - .../er_email/config/locales/en.yml | 3 ++ .../er_email/config/locales/zh_tw.yml | 3 ++ .../er_email/config/routes.rb | 1 + 16 files changed, 124 insertions(+), 52 deletions(-) diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/approvals_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/approvals_controller.rb index 8cac22bbe..d2320fb02 100644 --- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/approvals_controller.rb +++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/approvals_controller.rb @@ -7,6 +7,7 @@ class Panel::Announcement::BackEnd::ApprovalsController < OrbitBackendControlle def preview_and_approve + email_group_data @bulletin = Bulletin.find params[:bulletin_id] end @@ -112,7 +113,8 @@ class Panel::Announcement::BackEnd::ApprovalsController < OrbitBackendControlle :mail_subject => "#{t("announcement.mail_subject",:site_title => @site.title)}：#{bulletin.title}", :mail_to => @group_mail.join(','), :mail_content => @mail_content , - :mail_sentdate => bulletin.email_sentdate, + # :mail_sentdate => bulletin.email_sentdate, + :mail_sentdate => DateTime.now, :create_user_id => bulletin.create_user_id, :update_user_id => bulletin.create_user_id } @@ -121,6 +123,8 @@ class Panel::Announcement::BackEnd::ApprovalsController < OrbitBackendControlle @mail_cron.save + MailCron.send_mail_now(@mail_cron.id) + end end diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb index 299dd8399..edc7c012b 100644 --- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb +++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb @@ -153,12 +153,12 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController respond_to do |format| if @bulletin.save - if @bulletin.email_sent == true && @bulletin.is_checked == true && !@bulletin.is_rejected - send_email_data(@bulletin) + # if @bulletin.email_sent == true && @bulletin.is_checked == true && !@bulletin.is_rejected + # send_email_data(@bulletin) - @bulletin.email_sent = false - @bulletin.save - end + # @bulletin.email_sent = false + # @bulletin.save + # end format.html { redirect_to(panel_announcement_back_end_bulletins_url, :notice => t('announcement.create_bulletin_success')) } format.xml { render :xml => @bulletin, :status => :created, :location => @bulletin } @@ -241,12 +241,12 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController @bulletin.de_pending! end - if @bulletin.email_sent == true && @bulletin.is_checked == true && !@bulletin.is_rejected - send_email_data(@bulletin) + # if @bulletin.email_sent == true && @bulletin.is_checked == true && !@bulletin.is_rejected + # send_email_data(@bulletin) - @bulletin.email_sent = false - @bulletin.save - end + # @bulletin.email_sent = false + # @bulletin.save + # end # if (params[:bulletin][:is_checked] == "false") # @bulletin.is_rejected = true @@ -356,7 +356,8 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController :mail_subject => "#{t("announcement.mail_subject",:site_title => @site.title)}：#{bulletin.title}", :mail_to => @group_mail.join(','), :mail_content => @mail_content , - :mail_sentdate => bulletin.email_sentdate, + # :mail_sentdate => bulletin.email_sentdate, + :mail_sentdate => DateTime.now, :create_user_id => bulletin.create_user_id, :update_user_id => bulletin.create_user_id } @@ -365,6 +366,8 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController @mail_cron.save + MailCron.send_mail_now(@mail_cron.id) + end end diff --git a/vendor/built_in_modules/announcement/app/models/bulletin.rb b/vendor/built_in_modules/announcement/app/models/bulletin.rb index 2b33d06b3..e86ca5bea 100644 --- a/vendor/built_in_modules/announcement/app/models/bulletin.rb +++ b/vendor/built_in_modules/announcement/app/models/bulletin.rb @@ -221,6 +221,32 @@ class Bulletin preview_object end + def get_email_group_data(email_group_data) + + group_mail = Array.new + + self.email_group.each do |egroup| + + if email_group_data.include?(egroup) and (egroup == '0' or egroup == '1' or egroup == '2' or egroup == '3') + + group_mail << "#{email_group_data[egroup]["email"]}(#{email_group_data[egroup]["name"]})" + + elsif email_group_data.include?(egroup) and egroup == '4' + + self.other_mailaddress.split(",").each do |otmail| + + group_mail << "#{otmail}(#{email_group_data[egroup]["name"]})" + + end + + end + + end + + group_mail.join("
").html_safe + + end + protected diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/approvals/_modal_approve.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/approvals/_modal_approve.html.erb index 797757a58..bed04d202 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/approvals/_modal_approve.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/approvals/_modal_approve.html.erb @@ -14,6 +14,12 @@ <%# preview_block_ad_images_helper(bulletin).each do |ad_image| -%> <%#= image_tag ad_image.file,:alt => (ad_image.title[locale] || " "),:time_to_next => bulletin.transition_msec,:link_open=> ad_image.link_open, :link_url =>((ad_image.out_link || bulletin.context || " ")) %> <%# end -%> + + <% if !@bulletin.email_group.blank? %> + <%= label_tag 'group_mail' %> + <%= @bulletin.get_email_group_data(@email_group_data) %> + <% end %> +

diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb index 54ee14a9b..c3694ee31 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb @@ -278,7 +278,7 @@
- <%= f.datetime_picker :email_sentdate, :picker_type => 'separated', :label => t("announcement.email_sentdate") %> + <%#= f.datetime_picker :email_sentdate, :picker_type => 'separated', :label => t("announcement.email_sentdate") %>
diff --git a/vendor/built_in_modules/er_email/app/controllers/panel/er_email/back_end/approvals_controller.rb b/vendor/built_in_modules/er_email/app/controllers/panel/er_email/back_end/approvals_controller.rb index 68cdce866..70883ce7f 100644 --- a/vendor/built_in_modules/er_email/app/controllers/panel/er_email/back_end/approvals_controller.rb +++ b/vendor/built_in_modules/er_email/app/controllers/panel/er_email/back_end/approvals_controller.rb @@ -6,6 +6,7 @@ class Panel::ErEmail::BackEnd::ApprovalsController < OrbitBackendController def preview_and_approve + email_group_data @email_er = EmailEr.find params[:email_er_id] end @@ -102,7 +103,8 @@ class Panel::ErEmail::BackEnd::ApprovalsController < OrbitBackendController :mail_subject => email_er.mail_subject, :mail_to => @group_mail.join(','), :mail_content => @mail_content , - :mail_sentdate => email_er.mail_sentdate, + # :mail_sentdate => email_er.mail_sentdate, + :mail_sentdate => DateTime.now, :create_user_id => email_er.create_user_id, :update_user_id => email_er.create_user_id } @@ -128,6 +130,8 @@ class Panel::ErEmail::BackEnd::ApprovalsController < OrbitBackendController @mail_cron.save + MailCron.send_mail_now(@mail_cron.id) + end end @@ -137,4 +141,5 @@ class Panel::ErEmail::BackEnd::ApprovalsController < OrbitBackendController @email_group_data = EmailEr.email_group_data end + end diff --git a/vendor/built_in_modules/er_email/app/controllers/panel/er_email/back_end/email_ers_controller.rb b/vendor/built_in_modules/er_email/app/controllers/panel/er_email/back_end/email_ers_controller.rb index 2a689cede..d2d2fb863 100644 --- a/vendor/built_in_modules/er_email/app/controllers/panel/er_email/back_end/email_ers_controller.rb +++ b/vendor/built_in_modules/er_email/app/controllers/panel/er_email/back_end/email_ers_controller.rb @@ -56,6 +56,9 @@ class Panel::ErEmail::BackEnd::EmailErsController < OrbitBackendController # GET /email_ers/1.xml def show + + email_group_data + @item = Page.find(params[:page_id]) rescue nil if params[:preview] == "true" preview_content @@ -123,9 +126,9 @@ class Panel::ErEmail::BackEnd::EmailErsController < OrbitBackendController respond_to do |format| if @email_er.save - if @email_er.is_checked == true and !@email_er.is_rejected - send_email_data(@email_er) - end + # if @email_er.is_checked == true and !@email_er.is_rejected + # send_email_data(@email_er) + # end format.html { redirect_to(panel_er_email_back_end_email_ers_url) } format.xml { render :xml => @email_er, :status => :created, :location => @email_er } @@ -212,28 +215,52 @@ class Panel::ErEmail::BackEnd::EmailErsController < OrbitBackendController redirect_to panel_er_email_back_end_email_ers_url(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options]) end + def test_send_email + if params[:id] + @email_er = EmailEr.find(params[:id]) + + if (@email_er.create_user_id == current_or_guest_user.id) || is_manager? + if current_or_guest_user.admin? || (!@email_er.is_rejected? && !@email_er.is_checked?) + if @email_er.is_pending + send_email_data( @email_er , true ) + end + end + end + end + redirect_to panel_er_email_back_end_email_ers_url(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options]) + end + protected - def send_email_data(email_er) + def send_email_data(email_er , test_send = false) @user = User.find(email_er.create_user_id) - email_group_data + if !test_send - @group_mail = Array.new + email_group_data - email_er.email_group.each do |egroup| + @group_mail = Array.new - if @email_group_data.include?(egroup) and (egroup == '0' or egroup == '1' or egroup == '2' or egroup == '3') + email_er.email_group.each do |egroup| - @group_mail << @email_group_data[egroup]["email"] + if @email_group_data.include?(egroup) and (egroup == '0' or egroup == '1' or egroup == '2' or egroup == '3') - elsif @email_group_data.include?(egroup) and egroup == '4' + @group_mail << @email_group_data[egroup]["email"] - @group_mail << email_er.other_mailaddress + elsif @email_group_data.include?(egroup) and egroup == '4' + + @group_mail << email_er.other_mailaddress + + end end + else + + # @group_mail = ["spen@rulingcom.com"] + @group_mail = [@user.email] + end if !@group_mail.join.blank? @@ -249,7 +276,8 @@ class Panel::ErEmail::BackEnd::EmailErsController < OrbitBackendController :mail_subject => email_er.mail_subject, :mail_to => @group_mail.join(','), :mail_content => @mail_content , - :mail_sentdate => email_er.mail_sentdate, + # :mail_sentdate => email_er.mail_sentdate, + :mail_sentdate => DateTime.now, :create_user_id => email_er.create_user_id, :update_user_id => email_er.create_user_id } @@ -275,6 +303,8 @@ class Panel::ErEmail::BackEnd::EmailErsController < OrbitBackendController @mail_cron.save + MailCron.send_mail_now(@mail_cron.id) + end end diff --git a/vendor/built_in_modules/er_email/app/models/email_er.rb b/vendor/built_in_modules/er_email/app/models/email_er.rb index 413d22c24..a3faaa180 100644 --- a/vendor/built_in_modules/er_email/app/models/email_er.rb +++ b/vendor/built_in_modules/er_email/app/models/email_er.rb @@ -35,6 +35,8 @@ class EmailEr accepts_nested_attributes_for :email_er_files, :allow_destroy => true validates :mail_subject,presence:{message:'blank is not allowed'} + validates :other_mailaddress, + :length => {:maximum => 1000, :message => I18n.t("er_email.other_mailaddress_note_limit")} def proc_check(check,not_pass_info = "") self.is_checked = true diff --git a/vendor/built_in_modules/er_email/app/views/panel/er_email/back_end/approvals/_modal_approve.html.erb b/vendor/built_in_modules/er_email/app/views/panel/er_email/back_end/approvals/_modal_approve.html.erb index 440a275ba..29f3610dd 100644 --- a/vendor/built_in_modules/er_email/app/views/panel/er_email/back_end/approvals/_modal_approve.html.erb +++ b/vendor/built_in_modules/er_email/app/views/panel/er_email/back_end/approvals/_modal_approve.html.erb @@ -9,7 +9,13 @@
diff --git a/vendor/built_in_modules/er_email/app/views/panel/er_email/back_end/email_ers/_email_er.html.erb b/vendor/built_in_modules/er_email/app/views/panel/er_email/back_end/email_ers/_email_er.html.erb index 2b05ec595..ddb7363d2 100644 --- a/vendor/built_in_modules/er_email/app/views/panel/er_email/back_end/email_ers/_email_er.html.erb +++ b/vendor/built_in_modules/er_email/app/views/panel/er_email/back_end/email_ers/_email_er.html.erb @@ -32,6 +32,11 @@ <% if current_or_guest_user.admin? || (!email_er.is_rejected? && !email_er.is_checked?) %>
  • <%= link_to t(:edit), edit_panel_er_email_back_end_email_er_path(email_er, :page => params[:page], :filter => @filter) %>
    • + + <% if email_er.is_pending %> +
  • <%= link_to t('er_email.test_send_email'), test_send_email_panel_er_email_back_end_email_ers_path(:id=>email_er.id), :confirm => t('sure?'), :controller => "email_er", :action => "test_send_email" %>
    • + <% end %> + <% end %>
  • <%= link_to t(:delete_), panel_er_email_back_end_email_er_path(email_er), :confirm => t('sure?'), :method => :delete, :remote => true %>
    • @@ -53,7 +58,4 @@ <%= email_er.get_email_group_data(@email_group_data) %> - - <%= display_date_time(email_er.mail_sentdate) %> - \ No newline at end of file diff --git a/vendor/built_in_modules/er_email/app/views/panel/er_email/back_end/email_ers/_form.html.erb b/vendor/built_in_modules/er_email/app/views/panel/er_email/back_end/email_ers/_form.html.erb index 052cc8121..cd07d2ba4 100644 --- a/vendor/built_in_modules/er_email/app/views/panel/er_email/back_end/email_ers/_form.html.erb +++ b/vendor/built_in_modules/er_email/app/views/panel/er_email/back_end/email_ers/_form.html.erb @@ -6,23 +6,6 @@ <%= f.error_messages %> - - -
    - -
    -

    <%= t("er_email.mail_sentdate") %>

    -
    -
    - <%= f.datetime_picker :mail_sentdate, :picker_type => 'separated', :label => t(:start) %> -
    -
    -
    - -
    - - -
    @@ -48,8 +31,8 @@
    - <%= f.label :other_mailaddress ,"#{t("er_email.other_mailaddress")}(#{t("er_email.other_mailaddress_note")})"%> - <%= f.text_area :other_mailaddress, :class=>"span12", :cols=>"25", :rows=>"10" %> + <%= f.label :other_mailaddress ,"#{t("er_email.other_mailaddress")}(#{t("er_email.other_mailaddress_note")})(#{t("er_email.other_mailaddress_note_limit")})"%> + <%= f.text_area :other_mailaddress, :class=>"span12", :rows=>"5" %>
    diff --git a/vendor/built_in_modules/er_email/app/views/panel/er_email/back_end/email_ers/_sort_headers.html.erb b/vendor/built_in_modules/er_email/app/views/panel/er_email/back_end/email_ers/_sort_headers.html.erb index b3c0735c3..39932f7fc 100644 --- a/vendor/built_in_modules/er_email/app/views/panel/er_email/back_end/email_ers/_sort_headers.html.erb +++ b/vendor/built_in_modules/er_email/app/views/panel/er_email/back_end/email_ers/_sort_headers.html.erb @@ -2,5 +2,4 @@ ['status', ['is_pending', 'is_checked', 'is_rejected'], 'span1', :status], ['category', 'email_er_category', 'span1', :category], ['subject', 'mail_subject','span2', 'er_email.mail_subject'] , - ['email_group', 'email_group','span2', 'er_email.email_group'] , - ['sentdate', 'mail_sentdate','span2', 'er_email.mail_sentdate'] ).html_safe %> \ No newline at end of file + ['email_group', 'email_group','span2', 'er_email.email_group']).html_safe %> \ No newline at end of file diff --git a/vendor/built_in_modules/er_email/app/views/panel/er_email/back_end/email_ers/index.html.erb b/vendor/built_in_modules/er_email/app/views/panel/er_email/back_end/email_ers/index.html.erb index b413b247e..375577b85 100644 --- a/vendor/built_in_modules/er_email/app/views/panel/er_email/back_end/email_ers/index.html.erb +++ b/vendor/built_in_modules/er_email/app/views/panel/er_email/back_end/email_ers/index.html.erb @@ -8,7 +8,6 @@ - diff --git a/vendor/built_in_modules/er_email/config/locales/en.yml b/vendor/built_in_modules/er_email/config/locales/en.yml index c8db2948c..a44d4f084 100644 --- a/vendor/built_in_modules/er_email/config/locales/en.yml +++ b/vendor/built_in_modules/er_email/config/locales/en.yml @@ -10,6 +10,8 @@ en: approve_email_er_fail: Approval Fail approve_email_er_success: Approve Successfully create_email_er_success: Create Successfully + email_resend: Resend + test_send_email: Test Send Email mail_subject: Mail Subject mail_content: Mail Content mail_sentdate: Email Time @@ -21,4 +23,5 @@ en: email_group_data_4: Other other_mailaddress: Other Email other_mailaddress_note: Divide different email accounts with "," + other_mailaddress_note_limit: maximum 1000 characters email_file_limit: File upload size is limited to 1MB \ No newline at end of file diff --git a/vendor/built_in_modules/er_email/config/locales/zh_tw.yml b/vendor/built_in_modules/er_email/config/locales/zh_tw.yml index e7b899e6c..1553eeb4b 100644 --- a/vendor/built_in_modules/er_email/config/locales/zh_tw.yml +++ b/vendor/built_in_modules/er_email/config/locales/zh_tw.yml @@ -10,12 +10,15 @@ zh_tw: approve_email_er_fail: 審核失敗 approve_email_er_success: 審核成功 create_email_er_success: 建立資料成功 + email_resend: 重新寄送 + test_send_email: 測試寄信 mail_subject: 主旨 mail_content: 信件內容 mail_sentdate: 寄送時間 email_group: 寄送群組 other_mailaddress: 其他Mail other_mailaddress_note: 輸入多組mail時,請用","逗號隔開 + other_mailaddress_note_limit: 限制1000字元以內 email_group_data_0: 全校教職員 email_group_data_1: 大學部學生 email_group_data_2: 日間部研究生 diff --git a/vendor/built_in_modules/er_email/config/routes.rb b/vendor/built_in_modules/er_email/config/routes.rb index 1f1620c42..1fe6ae9f7 100644 --- a/vendor/built_in_modules/er_email/config/routes.rb +++ b/vendor/built_in_modules/er_email/config/routes.rb @@ -16,6 +16,7 @@ Rails.application.routes.draw do put "preview" get 'delete' get 'email_resend' + get 'test_send_email' end end