Skip to content

Commit

Permalink
fix #512
Browse files Browse the repository at this point in the history
  • Loading branch information
elad-eyal committed Nov 24, 2019
1 parent eda9b71 commit 0ce1fc4
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
2 changes: 1 addition & 1 deletion app/controllers/application_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ def info_for_paper_trail

def default_url_options
result = { locale: params[:locale] }
result[:conference_acronym] = @conference.acronym if @conference
result[:conference_acronym] = @conference.persisted_acronym if @conference
result
end

Expand Down
4 changes: 4 additions & 0 deletions app/models/conference.rb
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,10 @@ def to_s
def to_label
acronym
end

def persisted_acronym
changed_attributes['acronym'] || acronym
end

private

Expand Down

0 comments on commit 0ce1fc4

Please sign in to comment.