Commit 97438cf31dca5916545bee44545193054a91d4cf
2021-12-12T12:51:58
do not redirect in repo for branch but display first branch
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64
diff --git a/lib/kmxgit_web/controllers/repository_controller.ex b/lib/kmxgit_web/controllers/repository_controller.ex
index 547492e..ccb8a8f 100644
--- a/lib/kmxgit_web/controllers/repository_controller.ex
+++ b/lib/kmxgit_web/controllers/repository_controller.ex
@@ -104,27 +104,25 @@ defmodule KmxgitWeb.RepositoryController do
org = repo.organisation
user = repo.user
git = setup_git(repo, branch || "master", path, conn)
- first_branch = Enum.at(git.branches, 0)
- if !branch && first_branch do
- {b, _} = first_branch
+ first_branch = case Enum.at(git.branches, 0) do
+ {first_branch, _} -> first_branch
+ nil -> nil
+ end
+ branch1 = branch || first_branch
+ if git.valid do
conn
- |> redirect(to: Routes.repository_path(conn, :show, Repository.owner_slug(repo), Repository.splat(repo) ++ ["_branch", b]))
+ |> assign(:branch, branch1)
+ |> assign(:branch_url, Routes.repository_path(conn, :show, Repository.owner_slug(repo), Repository.splat(repo) ++ ["_branch", branch1]))
+ |> assign_current_organisation(org)
+ |> assign(:current_repository, repo)
+ |> assign(:git, git)
+ |> assign(:repo, repo)
+ |> assign(:members, Repository.members(repo))
+ |> assign(:owner, org || user)
+ |> assign(:path, path)
+ |> render("show.html")
else
- if git.valid do
- conn
- |> assign(:branch, branch)
- |> assign(:branch_url, if git.branches != [] do branch_url(git.branches, branch) end)
- |> assign_current_organisation(org)
- |> assign(:current_repository, repo)
- |> assign(:git, git)
- |> assign(:repo, repo)
- |> assign(:members, Repository.members(repo))
- |> assign(:owner, org || user)
- |> assign(:path, path)
- |> render("show.html")
- else
- not_found(conn)
- end
+ not_found(conn)
end
else
not_found(conn)
@@ -175,14 +173,6 @@ defmodule KmxgitWeb.RepositoryController do
|> git_put_readme(repo)
end
- defp branch_url([{b, url} | rest], branch) do
- if b == branch do
- url
- else
- branch_url(rest, branch)
- end
- end
-
defp git_put_branches(git = %{valid: true}, repo, conn) do
case GitManager.branches(Repository.full_slug(repo)) do
{:ok, branches} ->