Commit ec1ee27fc7fd12ad85784c886d8da9b854887815
2022-07-10T16:19:51
[admin] slug_
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 65 66 67 68
diff --git a/lib/kmxgit_web/controllers/admin/organisation_controller.ex b/lib/kmxgit_web/controllers/admin/organisation_controller.ex
index 5202b9e..7cafe07 100644
--- a/lib/kmxgit_web/controllers/admin/organisation_controller.ex
+++ b/lib/kmxgit_web/controllers/admin/organisation_controller.ex
@@ -81,10 +81,14 @@ defmodule KmxgitWeb.Admin.OrganisationController do
case OrganisationManager.update_organisation(org, params["organisation"]) do
{:ok, org1} ->
if org.slug_ != org1.slug_ do
- case GitManager.rename_dir(org.slug_, org1.slug_) do
- :ok ->
- GitAuth.update()
- org1
+ case SlugManager.rename_slug(org.slug_, org1.slug_) do
+ {:ok, _slug} ->
+ case GitManager.rename_dir(org.slug_, org1.slug_) do
+ :ok ->
+ GitAuth.update()
+ org1
+ {:error, err} -> Repo.rollback(err)
+ end
{:error, err} -> Repo.rollback(err)
end
else
diff --git a/lib/kmxgit_web/controllers/admin/user_controller.ex b/lib/kmxgit_web/controllers/admin/user_controller.ex
index 41be5b4..68461f4 100644
--- a/lib/kmxgit_web/controllers/admin/user_controller.ex
+++ b/lib/kmxgit_web/controllers/admin/user_controller.ex
@@ -3,7 +3,10 @@ defmodule KmxgitWeb.Admin.UserController do
alias Kmxgit.IndexParams
alias Kmxgit.GitAuth
+ alias Kmxgit.GitManager
+ alias Kmxgit.Repo
alias Kmxgit.RepositoryManager
+ alias Kmxgit.SlugManager
alias Kmxgit.UserManager
alias Kmxgit.UserManager.User
alias KmxgitWeb.ErrorView
@@ -83,9 +86,27 @@ defmodule KmxgitWeb.Admin.UserController do
def update(conn, params) do
user = UserManager.get_user(params["id"])
if user do
- case UserManager.admin_update_user(user, params["user"]) do
+ case Repo.transaction(fn ->
+ case UserManager.admin_update_user(user, params["user"]) do
+ {:ok, user1} ->
+ if user.slug_ != user1.slug_ do
+ case SlugManager.rename_slug(user.slug_, user1.slug_) do
+ {:ok, _slug} ->
+ case GitManager.rename_dir(user.slug_, user1.slug_) do
+ :ok ->
+ GitAuth.update()
+ user1
+ {:error, err} -> Repo.rollback(err)
+ end
+ {:error, err} -> Repo.rollback(err)
+ end
+ else
+ user1
+ end
+ {:error, changeset} -> Repo.rollback(changeset)
+ end
+ end) do
{:ok, user1} ->
- GitAuth.update()
conn
|> redirect(to: Routes.admin_user_path(conn, :show, user1))
{:error, changeset} ->