Compare commits
4 Commits
Author | SHA1 | Date |
---|---|---|
Harry Bomrah | 8b8357af87 | |
Harry Bomrah | 8d9892f73d | |
spen | adfa7cab83 | |
spen | 0c03ba8439 |
|
@ -19,8 +19,8 @@ $(function () {
|
||||||
'use strict';
|
'use strict';
|
||||||
// Initialize the jQuery File Upload widget:
|
// Initialize the jQuery File Upload widget:
|
||||||
$('#fileupload').fileupload({
|
$('#fileupload').fileupload({
|
||||||
maxFileSize: 5000000,
|
maxFileSize: 50000000000,
|
||||||
acceptFileTypes: /(\.|\/)(gif|jpe?g|png|pdf|doc|docx|ppt|pptx|xls|xlsx)$/i,
|
acceptFileTypes: /(\.|\/)(gif|jpe?g|png|pdf|doc|docx|ppt|pptx|xls|xlsx|csv|txt|zip|rar|tar|gz|odt|tiff|key|page)$/i,
|
||||||
dropZone: $('#dropzone'),
|
dropZone: $('#dropzone'),
|
||||||
headers:{
|
headers:{
|
||||||
'X-CSRF-Token': $('meta[name="csrf-token"]').attr("content")
|
'X-CSRF-Token': $('meta[name="csrf-token"]').attr("content")
|
||||||
|
|
|
@ -63,7 +63,6 @@ class MailCronMailer < ActionMailer::Base
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
@mail_cron_log = {
|
@mail_cron_log = {
|
||||||
:mail_subject => @data.mail_subject,
|
:mail_subject => @data.mail_subject,
|
||||||
:mail_to => group_mail,
|
:mail_to => group_mail,
|
||||||
|
@ -74,10 +73,16 @@ class MailCronMailer < ActionMailer::Base
|
||||||
|
|
||||||
@mail_cron_log = MailCronLog.new(@mail_cron_log)
|
@mail_cron_log = MailCronLog.new(@mail_cron_log)
|
||||||
|
|
||||||
|
|
||||||
@mail_cron_log.save
|
@mail_cron_log.save
|
||||||
|
|
||||||
|
@mail_to_count = @data.mail_to.split(',') - group_mail.split(',')
|
||||||
|
|
||||||
|
if @mail_to_count.count == 0
|
||||||
@data.destroy
|
@data.destroy
|
||||||
|
else
|
||||||
|
@data.mail_to = @mail_to_count.join(',')
|
||||||
|
@data.save
|
||||||
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -38,7 +38,7 @@ class MailCron
|
||||||
|
|
||||||
if !email_user_id.blank?
|
if !email_user_id.blank?
|
||||||
|
|
||||||
@user = User.find(email_user_id)
|
@user = User.find(email_user_id) rescue nil
|
||||||
|
|
||||||
@group_mail << @user.email if !@user.blank?
|
@group_mail << @user.email if !@user.blank?
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue