Skip to content

Jb/872 traced errors: Handle some issues where an object might be nil #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jbx26 wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Jb/872 traced errors: Handle some issues where an object might be nil #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
176c98e
Reduce number of application errors
jbx26 Jul 13, 2015
d5c2b93
render json
jbx26 Jul 13, 2015
eec5c72
render json 2
jbx26 Jul 13, 2015
f9471bd
render json 3
jbx26 Jul 13, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion app/controllers/attachments_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,12 @@ def description
render json: {
title: @attachment.title,
description: @attachment.description,
author: @attachment.author.title,
author:
if @attachment.author
@attachment.author.title
else
''
end,
Copy link
Owner

@fiedl fiedl Jul 14, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Einfacher: @attachment.author.try(:title)

html: render_to_string(partial: 'attachments/description', formats: [:html], locals: {attachment: @attachment})
}
end
Expand Down
9 changes: 8 additions & 1 deletion app/mailers/post_mailer.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,14 @@ def post_email(text, recipients, subject, sender, group, post)

I18n.with_locale(recipients.first.try(:locale) || I18n.default_locale) do
message = mail(
to: @to_field, from: sender.email, subject: subject,
to: @to_field,
from:
if sender.kind_of? User
sender.email
elsif sender.kind_of? String
sender
end,
subject: subject,
Copy link
Owner

@fiedl fiedl Jul 14, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mögliches Duplikat für diese Änderung: 6fe2fdc

Copy link
Collaborator Author

@jbx26 jbx26 Jul 15, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ja, das ist identisch

reply_to: @reply_to
)
message.smtp_envelope_to = @smtp_envelope_to_field
Expand Down
6 changes: 5 additions & 1 deletion app/models/event.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,11 @@ def title
end

def to_param
"#{id} #{name} #{start_at.year}-#{start_at.month}-#{start_at.day}".parameterize
if start_at
"#{id} #{name} #{start_at.year}-#{start_at.month}-#{start_at.day}".parameterize
else
"#{id} #{name}".parameterize
end
end


Expand Down
4 changes: 2 additions & 2 deletions app/views/search/_preview_officer_group.html.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
- obj.memberships.includes(:descendant).each do |membership|
%p
= link_to membership.user.title, membership.user
= "(#{t(:since)} #{localize membership.valid_from.to_date})"
= "(#{t(:since)} #{localize membership.valid_from.to_date if membership.valid_from})"

- if obj.scope # which is the object the officer is officer for.
%p
= "#{t(:see_also)}:"
= link_to obj.scope.title, obj.scope
= link_to obj.scope.title, obj.scope