forked from shibao/cannery
		
	fix name collisions
This commit is contained in:
		@@ -45,9 +45,9 @@ defmodule CanneryWeb.TypeLive.Show do
 | 
			
		||||
       ) do
 | 
			
		||||
    custom_fields? =
 | 
			
		||||
      fields_to_display(type)
 | 
			
		||||
      |> Enum.any?(fn %{key: field, type: type} ->
 | 
			
		||||
      |> Enum.any?(fn %{key: field, type: column_type} ->
 | 
			
		||||
        default_value =
 | 
			
		||||
          case type do
 | 
			
		||||
          case column_type do
 | 
			
		||||
            :boolean -> false
 | 
			
		||||
            _other_type -> nil
 | 
			
		||||
          end
 | 
			
		||||
 
 | 
			
		||||
@@ -414,7 +414,7 @@ defmodule CanneryWeb.PackLiveTest do
 | 
			
		||||
    end
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  describe "Show pack with shot recorddd" do
 | 
			
		||||
  describe "Show pack with shot record" do
 | 
			
		||||
    setup [:register_and_log_in_user, :create_pack, :create_shot_record]
 | 
			
		||||
 | 
			
		||||
    test "updates shot_record in listing",
 | 
			
		||||
@@ -422,7 +422,7 @@ defmodule CanneryWeb.PackLiveTest do
 | 
			
		||||
      {:ok, index_live, _html} = live(conn, Routes.pack_show_path(conn, :edit, pack))
 | 
			
		||||
 | 
			
		||||
      assert index_live
 | 
			
		||||
             |> element(~s/a[aria-label="Edit shot recordd of #{shot_record.count} shots"]/)
 | 
			
		||||
             |> element(~s/a[aria-label="Edit shot record of #{shot_record.count} shots"]/)
 | 
			
		||||
             |> render_click() =~ "Edit Shot Record"
 | 
			
		||||
 | 
			
		||||
      assert_patch(
 | 
			
		||||
 
 | 
			
		||||
@@ -38,7 +38,7 @@ defmodule CanneryWeb.TypeLiveTest do
 | 
			
		||||
    count: 20
 | 
			
		||||
  }
 | 
			
		||||
  @shot_record_attrs %{
 | 
			
		||||
    notes: "some shot recorddd",
 | 
			
		||||
    notes: "some shot record",
 | 
			
		||||
    count: 20
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user