Commit c83bbd92663685259d6336478d137a94d4acd0f3
2021-11-29T16:32:27
fix admin
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 5830a12..6b84e5b 100644
--- a/lib/kmxgit_web/controllers/admin/organisation_controller.ex
+++ b/lib/kmxgit_web/controllers/admin/organisation_controller.ex
@@ -1,15 +1,16 @@
defmodule KmxgitWeb.Admin.OrganisationController do
use KmxgitWeb, :controller
+ alias Kmxgit.GitManager
alias Kmxgit.OrganisationManager
alias Kmxgit.Repo
alias Kmxgit.SlugManager
alias KmxgitWeb.ErrorView
def index(conn, _params) do
- organisations = OrganisationManager.list_organisations
+ orgs = OrganisationManager.list_organisations
conn
- |> assign(:organisations, organisations)
+ |> assign(:orgss, orgs)
|> render("index.html")
end
@@ -102,10 +103,10 @@ defmodule KmxgitWeb.Admin.OrganisationController do
end) do
{:ok, org1} ->
conn
- |> redirect(to: Routes.admin_organisation_path(conn, :show, org))
+ |> redirect(to: Routes.admin_organisation_path(conn, :show, org1))
{:error, changeset} ->
conn
- |> assign(:action, Routes.admin_organisation_path(conn, :update, organisation))
+ |> assign(:action, Routes.admin_organisation_path(conn, :update, org))
|> assign(:changeset, changeset)
|> render("edit.html")
diff --git a/lib/kmxgit_web/controllers/admin/user_controller.ex b/lib/kmxgit_web/controllers/admin/user_controller.ex
index 2b89ced..94f5116 100644
--- a/lib/kmxgit_web/controllers/admin/user_controller.ex
+++ b/lib/kmxgit_web/controllers/admin/user_controller.ex
@@ -1,6 +1,7 @@
defmodule KmxgitWeb.Admin.UserController do
use KmxgitWeb, :controller
+ alias Kmxgit.GitManager
alias Kmxgit.UserManager
alias KmxgitWeb.ErrorView
diff --git a/lib/kmxgit_web/templates/admin/organisation/index.html.heex b/lib/kmxgit_web/templates/admin/organisation/index.html.heex
index 800e554..9471e5d 100644
--- a/lib/kmxgit_web/templates/admin/organisation/index.html.heex
+++ b/lib/kmxgit_web/templates/admin/organisation/index.html.heex
@@ -1,5 +1,5 @@
<div class="container-fluid">
- <h1>Organisations</h1>
+ <h1><%= gettext "Organisations" %></h1>
<table class="table admin-index">
<tr>
@@ -7,7 +7,7 @@
<th><%= gettext "Name" %></th>
<th><%= gettext "Slug" %></th>
</tr>
- <%= Enum.map @organisations, fn(org) -> %>
+ <%= Enum.map @orgs, fn org -> %>
<tr>
<td><%= link org.id, to: Routes.admin_organisation_path(@conn, :show, org) %></td>
<td><%= org.name %></td>