Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactor methods post feedback

This commit is contained in:
Arpit Jalan 2014-06-26 22:49:34 +05:30
parent 52f9984804
commit dad2d34d02
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/jobs/regular/bulk_invite.rb
View File

@ -47,14 +47,10 @@ module Jobs
return csv_path return csv_path
end end
def validate_email(email)
/\A[^@\s]+@([^@\s]+\.)+[^@\s]+\z/.match(email)
end
def read_csv_file(csv_path) def read_csv_file(csv_path)
CSV.foreach(csv_path) do |csv_info| CSV.foreach(csv_path) do |csv_info|
if !csv_info[0].nil? if csv_info[0]
if validate_email(csv_info[0]) if (EmailValidator.email_regex =~ csv_info[0])
# email is valid # email is valid
send_invite(csv_info, $INPUT_LINE_NUMBER) send_invite(csv_info, $INPUT_LINE_NUMBER)
@sent += 1 @sent += 1
@ -69,16 +65,17 @@ module Jobs
def get_group_ids(group_names, csv_line_number) def get_group_ids(group_names, csv_line_number)
group_ids = [] group_ids = []
if !group_names.nil? if group_names
group_names = group_names.split(';') group_names = group_names.split(';')
group_names.each { |group_name| group_names.each { |group_name|
group_detail = Group.find_by_name(group_name) group_detail = Group.find_by_name(group_name)
if !group_detail.nil? if group_detail
# valid group # valid group
group_ids.push(group_detail.id) group_ids.push(group_detail.id)
else else
# invalid group # invalid group
log "Invalid Group '#{group_name}' at line number '#{csv_line_number}'" log "Invalid Group '#{group_name}' at line number '#{csv_line_number}'"
@failed += 1
end end
} }
end end
@ -87,10 +84,11 @@ module Jobs
def get_topic(topic_id, csv_line_number) def get_topic(topic_id, csv_line_number)
topic = nil topic = nil
if !topic_id.nil? if topic_id
topic = Topic.find_by_id(topic_id) topic = Topic.find_by_id(topic_id)
if topic.nil? if topic.nil?
log "Invalid Topic ID '#{topic_id}' at line number '#{csv_line_number}'" log "Invalid Topic ID '#{topic_id}' at line number '#{csv_line_number}'"
@failed += 1
end end
end end
return topic return topic

2
config/locales/server.en.yml
View File

@ -1291,7 +1291,7 @@ en:
bulk_invite_failed: bulk_invite_failed:
subject_template: "Bulk Invite processed with some errors!" subject_template: "Bulk Invite processed with some errors!"
text_body_template: | text_body_template: |
The bulk invite has been processed, %{sent} invites sent and %{failed} invites failed. The bulk invite has been processed, %{sent} invites sent with %{failed} error(s).
Here's the log: Here's the log: