tietokonepaja/runosaari.net
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed admin path helper for admin paths.

Browse Source
This commit is contained in:
codevictory
2021-05-04 23:12:55 +03:00
parent 80d9166abc
commit 95cadab9c6
11 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/runosaari_web/controllers/performance_controller.ex
View File

@@ -24,7 +24,7 @@ defmodule RunosaariWeb.PerformanceController do
{:ok, performance} ->
conn
|> put_flash(:info, "Näytös luotu.")
|> redirect(to: Routes.performance_path(conn, :show, performance))
|> redirect(to: Routes.admin_performance_path(conn, :show, performance))
{:error, %Ecto.Changeset{} = changeset} ->
render(conn, "new.html", changeset: changeset)
@@ -49,7 +49,7 @@ defmodule RunosaariWeb.PerformanceController do
{:ok, performance} ->
conn
|> put_flash(:info, "Näytös päivitetty.")
|> redirect(to: Routes.performance_path(conn, :show, performance))
|> redirect(to: Routes.admin_performance_path(conn, :show, performance))
{:error, %Ecto.Changeset{} = changeset} ->
render(conn, "edit.html", performance: performance, changeset: changeset)

2
lib/runosaari_web/controllers/performer_controller.ex
View File

@@ -52,7 +52,7 @@ defmodule RunosaariWeb.PerformerController do
{:ok, performer} ->
conn
|> put_flash(:info, "Esiintyjän tiedot päivitetty.")
|> redirect(to: Routes.performer_path(conn, :show, performer))
|> redirect(to: Routes.admin_performer_path(conn, :show, performer))
{:error, %Ecto.Changeset{} = changeset} ->
render(conn, "edit.html", performer: performer, changeset: changeset)

6
lib/runosaari_web/controllers/visitor_controller.ex
View File

@@ -43,7 +43,7 @@ defmodule RunosaariWeb.VisitorController do
{:ok, visitor} ->
conn
|> put_flash(:info, "Visitor updated successfully.")
|> redirect(to: Routes.visitor_path(conn, :show, visitor))
|> redirect(to: Routes.admin_visitor_path(conn, :show, visitor))
{:error, %Ecto.Changeset{} = changeset} ->
render(conn, "edit.html", visitor: visitor, changeset: changeset)
@@ -52,11 +52,11 @@ defmodule RunosaariWeb.VisitorController do
def delete(conn, %{"id" => id}) do
visitor = Registration.get_visitor!(id)
{:ok, _visitor} = Registration.delete_visitor(visitor)
{:ok, _visitor} = Registration.admin_delete_visitor(visitor)
conn
|> put_flash(:info, "Visitor deleted successfully.")
|> redirect(to: Routes.visitor_path(conn, :index))
|> redirect(to: Routes.admin_visitor_path(conn, :index))
end
def confirmation(conn, _params) do

2
lib/runosaari_web/templates/performance/admin.html.eex
View File

@@ -16,7 +16,7 @@
<td><%= performance.desc %></td>
<td>
<span><%= link "Lisätietoja", to: Routes.performance_path(@conn, :show, performance) %></span>
<span><%= link "Lisätietoja", to: Routes.admin_performance_path(@conn, :show, performance) %></span>
<span><%= link "Muokkaa", to: Routes.admin_performance_path(@conn, :edit, performance) %></span>
<span><%= link "Poista", to: Routes.admin_performance_path(@conn, :delete, performance), method: :delete, data: [confirm: "Haluatko poistaa näytöksen #{performance.name}?"] %></span>
</td>

2
lib/runosaari_web/templates/performer/admin.html.eex
View File

@@ -24,7 +24,7 @@
<td><%= performer.desc %></td>
<td>
<span><%= link "Lisätietoja", to: Routes.performer_path(@conn, :show, performer) %></span>
<span><%= link "Lisätietoja", to: Routes.admin_performer_path(@conn, :show, performer) %></span>
<span><%= link "Muokkaa", to: Routes.admin_performer_path(@conn, :edit, performer) %></span>
<span><%= link "Poista", to: Routes.admin_performer_path(@conn, :delete, performer), method: :delete, data: [confirm: "Haluatko poistaa esiintyjän #{performer.fname} #{performer.lname}?"] %></span>
</td>

4
lib/runosaari_web/templates/visitor/edit.html.eex
View File

@@ -1,5 +1,5 @@
<h1>Edit Visitor</h1>
<%= render "form.html", Map.put(assigns, :action, Routes.visitor_path(@conn, :update, @visitor)) %>
<%= render "form.html", Map.put(assigns, :action, Routes.admin_visitor_path(@conn, :update, @visitor)) %>
<span><%= link "Back", to: Routes.visitor_path(@conn, :index) %></span>
<span><%= link "Back", to: Routes.admin_visitor_path(@conn, :index) %></span>

6
lib/runosaari_web/templates/visitor/index.html.eex
View File

@@ -30,9 +30,9 @@
<td><%= visitor.accom %></td>
<td>
<span><%= link "Show", to: Routes.visitor_path(@conn, :show, visitor) %></span>
<span><%= link "Edit", to: Routes.visitor_path(@conn, :edit, visitor) %></span>
<span><%= link "Delete", to: Routes.visitor_path(@conn, :delete, visitor), method: :delete, data: [confirm: "Are you sure?"] %></span>
<span><%= link "Show", to: Routes.admin_visitor_path(@conn, :show, visitor) %></span>
<span><%= link "Edit", to: Routes.admin_visitor_path(@conn, :edit, visitor) %></span>
<span><%= link "Delete", to: Routes.admin_visitor_path(@conn, :delete, visitor), method: :delete, data: [confirm: "Are you sure?"] %></span>
</td>
</tr>
<% end %>

4
lib/runosaari_web/templates/visitor/show.html.eex
View File

@@ -49,5 +49,5 @@
</ul>
<span><%= link "Edit", to: Routes.visitor_path(@conn, :edit, @visitor) %></span>
<span><%= link "Back", to: Routes.visitor_path(@conn, :index) %></span>
<span><%= link "Edit", to: Routes.admin_visitor_path(@conn, :edit, @visitor) %></span>
<span><%= link "Back", to: Routes.admin_visitor_path(@conn, :index) %></span>

10
test/runosaari_web/controllers/performance_controller_test.exs
View File

@@ -41,9 +41,9 @@ defmodule RunosaariWeb.PerformanceControllerTest do
conn = post(conn, Routes.admin_performance_path(conn, :create), performance: @create_attrs)
assert %{id: id} = redirected_params(conn)
assert redirected_to(conn) == Routes.performance_path(conn, :show, id)
assert redirected_to(conn) == Routes.admin_performance_path(conn, :show, id)
conn = get(conn, Routes.performance_path(conn, :show, id))
conn = get(conn, Routes.admin_performance_path(conn, :show, id))
assert html_response(conn, 200) =~ "Näytös"
end
@@ -71,9 +71,9 @@ defmodule RunosaariWeb.PerformanceControllerTest do
performance: @update_attrs
)
assert redirected_to(conn) == Routes.performance_path(conn, :show, performance)
assert redirected_to(conn) == Routes.admin_performance_path(conn, :show, performance)
conn = get(conn, Routes.performance_path(conn, :show, performance))
conn = get(conn, Routes.admin_performance_path(conn, :show, performance))
assert html_response(conn, 200) =~ "some updated description"
end
@@ -95,7 +95,7 @@ defmodule RunosaariWeb.PerformanceControllerTest do
assert redirected_to(conn) == Routes.admin_performance_path(conn, :admin)
assert_error_sent 404, fn ->
get(conn, Routes.performance_path(conn, :show, performance))
get(conn, Routes.admin_performance_path(conn, :show, performance))
end
end
end

10
test/runosaari_web/controllers/performer_controller_test.exs
View File

@@ -70,9 +70,9 @@ defmodule RunosaariWeb.PerformerControllerTest do
conn = post(conn, Routes.admin_performer_path(conn, :create), performer: @create_attrs)
assert %{id: id} = redirected_params(conn)
assert redirected_to(conn) == Routes.performer_path(conn, :show, id)
assert redirected_to(conn) == Routes.admin_performer_path(conn, :show, id)
conn = get(conn, Routes.performer_path(conn, :show, id))
conn = get(conn, Routes.admin_performer_path(conn, :show, id))
assert html_response(conn, 200) =~ "Esiintyjän tiedot"
end
@@ -98,9 +98,9 @@ defmodule RunosaariWeb.PerformerControllerTest do
conn =
put(conn, Routes.admin_performer_path(conn, :update, performer), performer: @update_attrs)
assert redirected_to(conn) == Routes.performer_path(conn, :show, performer)
assert redirected_to(conn) == Routes.admin_performer_path(conn, :show, performer)
conn = get(conn, Routes.performer_path(conn, :show, performer))
conn = get(conn, Routes.admin_performer_path(conn, :show, performer))
assert html_response(conn, 200) =~ "some updated email"
end
@@ -120,7 +120,7 @@ defmodule RunosaariWeb.PerformerControllerTest do
assert redirected_to(conn) == Routes.admin_performer_path(conn, :admin)
assert_error_sent 404, fn ->
get(conn, Routes.performer_path(conn, :show, performer))
get(conn, Routes.admin_performer_path(conn, :show, performer))
end
end
end

22
test/runosaari_web/controllers/visitor_controller_test.exs
View File

@@ -44,7 +44,7 @@ defmodule RunosaariWeb.VisitorControllerTest do
describe "index" do
test "lists all visitors", %{conn: conn} do
conn = get(conn, Routes.visitor_path(conn, :index))
conn = get(conn, Routes.admin_visitor_path(conn, :index))
assert html_response(conn, 200) =~ "Listing Visitors"
end
end
@@ -61,9 +61,9 @@ defmodule RunosaariWeb.VisitorControllerTest do
conn = post(conn, Routes.visitor_path(conn, :create), visitor: @create_attrs)
assert %{id: id} = redirected_params(conn)
assert redirected_to(conn) == Routes.visitor_path(conn, :show, id)
assert redirected_to(conn) == Routes.admin_visitor_path(conn, :show, id)
conn = get(conn, Routes.visitor_path(conn, :show, id))
conn = get(conn, Routes.admin_visitor_path(conn, :show, id))
assert html_response(conn, 200) =~ "Show Visitor"
end
@@ -77,7 +77,7 @@ defmodule RunosaariWeb.VisitorControllerTest do
setup [:create_visitor]
test "renders form for editing chosen visitor", %{conn: conn, visitor: visitor} do
conn = get(conn, Routes.visitor_path(conn, :edit, visitor))
conn = get(conn, Routes.admin_visitor_path(conn, :edit, visitor))
assert html_response(conn, 200) =~ "Edit Visitor"
end
end
@@ -86,16 +86,16 @@ defmodule RunosaariWeb.VisitorControllerTest do
setup [:create_visitor]
test "redirects when data is valid", %{conn: conn, visitor: visitor} do
conn = put(conn, Routes.visitor_path(conn, :update, visitor), visitor: @update_attrs)
conn = put(conn, Routes.admin_visitor_path(conn, :update, visitor), visitor: @update_attrs)
assert redirected_to(conn) == Routes.visitor_path(conn, :show, visitor)
assert redirected_to(conn) == Routes.admin_visitor_path(conn, :show, visitor)
conn = get(conn, Routes.visitor_path(conn, :show, visitor))
conn = get(conn, Routes.admin_visitor_path(conn, :show, visitor))
assert html_response(conn, 200) =~ "some updated email"
end
test "renders errors when data is invalid", %{conn: conn, visitor: visitor} do
conn = put(conn, Routes.visitor_path(conn, :update, visitor), visitor: @invalid_attrs)
conn = put(conn, Routes.admin_visitor_path(conn, :update, visitor), visitor: @invalid_attrs)
assert html_response(conn, 200) =~ "Edit Visitor"
end
@@ -105,11 +105,11 @@ defmodule RunosaariWeb.VisitorControllerTest do
setup [:create_visitor]
test "deletes chosen visitor", %{conn: conn, visitor: visitor} do
conn = delete(conn, Routes.visitor_path(conn, :delete, visitor))
assert redirected_to(conn) == Routes.visitor_path(conn, :index)
conn = delete(conn, Routes.admin_visitor_path(conn, :delete, visitor))
assert redirected_to(conn) == Routes.admin_visitor_path(conn, :index)
assert_error_sent 404, fn ->
get(conn, Routes.visitor_path(conn, :show, visitor))
get(conn, Routes.admin_visitor_path(conn, :show, visitor))
end
end
end