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 0b93a2b21..0be043165 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 @@ -159,12 +159,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 } @@ -249,12 +249,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 @@ -403,6 +403,7 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController :mail_from_app => 'announcement', :mail_from => @user.email, :mail_reply_to => @user.email, + :mail_subject => "#{t("announcement.mail_subject")}:", :mail_subject => "#{t("announcement.mail_subject",:site_title => @site.title)}:#{bulletin.title}", :mail_to => @group_mail.join(','), :mail_content => @mail_content , 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 284bf8276..3ceb817ee 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 @@ -22,7 +22,11 @@ <% end %> -
+