From d2b7e3712c4190ae53834edf3c9e455aa306cac2 Mon Sep 17 00:00:00 2001 From: Marcin Kulik Date: Fri, 21 Jul 2017 15:14:48 +0200 Subject: [PATCH] Make put_rails_flash available in all controllers --- lib/asciinema/rails/flash.ex | 13 +++++++++++++ web/controllers/session_controller.ex | 4 ---- web/web.ex | 1 + 3 files changed, 14 insertions(+), 4 deletions(-) create mode 100644 lib/asciinema/rails/flash.ex diff --git a/lib/asciinema/rails/flash.ex b/lib/asciinema/rails/flash.ex new file mode 100644 index 0000000..1cd13d9 --- /dev/null +++ b/lib/asciinema/rails/flash.ex @@ -0,0 +1,13 @@ +defmodule Asciinema.Rails.Flash do + import Plug.Conn + + def put_rails_flash(conn, key, value) do + key = case key do + :info -> :notice + :error -> :alert + key -> key + end + + put_session(conn, :flash, %{discard: [], flashes: %{key => value}}) + end +end diff --git a/web/controllers/session_controller.ex b/web/controllers/session_controller.ex index 9ee3987..deb4e1b 100644 --- a/web/controllers/session_controller.ex +++ b/web/controllers/session_controller.ex @@ -64,10 +64,6 @@ defmodule Asciinema.SessionController do end end - defp put_rails_flash(conn, key, value) do - put_session(conn, :flash, %{discard: [], flashes: %{key => value}}) - end - defp redirect_to_profile(conn) do redirect(conn, to: profile_path(conn.assigns.current_user)) end diff --git a/web/web.ex b/web/web.ex index 88ae5c5..2999ebb 100644 --- a/web/web.ex +++ b/web/web.ex @@ -38,6 +38,7 @@ defmodule Asciinema.Web do import Asciinema.Router.Helpers import Asciinema.Router.Helpers.Extra import Asciinema.Gettext + import Asciinema.Rails.Flash end end