Skip to content

Commit

Permalink
Merge pull request #125 from jzigmund/bz1393244-flash_msg_import_expo…
Browse files Browse the repository at this point in the history
…rt_custom_reports

Display flash message on import/export custom report
  • Loading branch information
mzazrivec authored Jan 16, 2017
2 parents 3fdb896 + 1b92982 commit 5384b7b
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions app/controllers/report_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,10 @@ def x_show
def tree_select
@edit = nil
@sb[:select_node] = false
if @sb.key?(:flash_msg)
@flash_array = @sb[:flash_msg]
@sb[:flash_msg] = nil
end
# set these when a link on one of the summary screen was pressed
self.x_active_accord = params[:accord] if params[:accord]
self.x_active_tree = "#{params[:accord]}_tree" if params[:accord]
Expand Down

0 comments on commit 5384b7b

Please sign in to comment.