Changed a thing that I made wrong.

cesium · Jul 24, 2022 · 83f5dc7 · 83f5dc7
1 parent 8fb50ca
commit 83f5dc7
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/lib/karaokium_web/live/admin/karaoke_live/show.html.heex b/lib/karaokium_web/live/admin/karaoke_live/show.html.heex
@@ -175,7 +175,7 @@
   </section>
   <div>
     <span>
-      <%= live_patch("New Performance", to: Routes.admin_performance_new_path(@socket, :new, @karaoke.id, "admin")) %>
+      <%= live_patch("New Performance", to: Routes.admin_performance_new_path(@socket, :new, @karaoke.id)) %>
     </span>
   </div>
 <% end %>
diff --git a/lib/karaokium_web/live/admin/performance_live/new.ex b/lib/karaokium_web/live/admin/performance_live/new.ex
@@ -10,12 +10,12 @@ defmodule KaraokiumWeb.Admin.PerformanceLive.New do
   end
 
   @impl true
-  def handle_params(%{"karaoke_id" => karaoke_id, "return_to" => return_to}, _, socket) do
+  def handle_params(%{"karaoke_id" => karaoke_id}, _, socket) do
     {:noreply,
      socket
      |> assign(:performance, %Performance{})
      |> assign(:page_title, "New Performance")
      |> assign(:karaoke_id, karaoke_id)
-     |> assign(:return_to, return_to)}
+     |> assign(:roles, socket.assigns.current_user.permissions)}
   end
 end
diff --git a/lib/karaokium_web/live/admin/performance_live/new.html.heex b/lib/karaokium_web/live/admin/performance_live/new.html.heex
@@ -1,4 +1,4 @@
-<%= if @return_to == "live" do %>
+<%= if @roles == [] do %>
   <.live_component
     module={KaraokiumWeb.Admin.PerformanceLive.FormComponent}
     id={:new}

diff --git a/lib/karaokium_web/live/karaoke_live/show.html.heex b/lib/karaokium_web/live/karaoke_live/show.html.heex
@@ -71,7 +71,7 @@
         text={"#{@karaoke.name} - Starting soon"}
       />
       <span>
-        <%= live_patch("Create Performance", to: Routes.admin_performance_new_path(@socket, :new, @karaoke.id, "live")) %>
+        <%= live_patch("Create Performance", to: Routes.admin_performance_new_path(@socket, :new, @karaoke.id)) %>
       </span>
     <% else %>
       <.status karaoke={@karaoke} />

diff --git a/lib/karaokium_web/router.ex b/lib/karaokium_web/router.ex
@@ -101,7 +101,7 @@ defmodule KaraokiumWeb.Router do
             live "/:id/show/edit", KaraokeLive.Show, :edit
 
             live "/:karaoke_id/performances", PerformanceLive.Index, :index
-            live "/:karaoke_id/performances/new/:return_to", PerformanceLive.New, :new
+            live "/:karaoke_id/performances/new", PerformanceLive.New, :new
             live "/:karaoke_id/performances/:id/edit", PerformanceLive.Edit, :edit
             live "/:karaoke_id/performances/:id", PerformanceLive.Show, :show
             live "/:karaoke_id/performances/:id/show/edit", PerformanceLive.Show, :edit